Merge branch 'goclash' into develop

libethereum/Transaction.h

@@ -85,7 +85,25 @@ public:
 	/// Constructs a null transaction.
 	Transaction() {}
 
-	using TransactionBase::TransactionBase;
+	/// Constructs a signed message-call transaction.
+	Transaction(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, Address const& _dest, bytes const& _data, u256 const& _nonce, Secret const& _secret):
+		TransactionBase(_value, _gasPrice, _gas, _dest, _data, _nonce, _secret)
+	{}
+
+	/// Constructs a signed contract-creation transaction.
+	Transaction(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, bytes const& _data, u256 const& _nonce, Secret const& _secret):
+		TransactionBase(_value, _gasPrice, _gas, _data, _nonce, _secret)
+	{}
+
+	/// Constructs an unsigned message-call transaction.
+	Transaction(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, Address const& _dest, bytes const& _data, u256 const& _nonce = 0):
+		TransactionBase(_value, _gasPrice, _gas, _dest, _data, _nonce)
+	{}
+
+	/// Constructs an unsigned contract-creation transaction.
+	Transaction(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, bytes const& _data, u256 const& _nonce = 0):
+		TransactionBase(_value, _gasPrice, _gas, _data, _nonce)
+	{}
 
 	/// Constructs a transaction from the given RLP.
 	explicit Transaction(bytesConstRef _rlp, CheckTransaction _checkSig);

libethereum/TransactionQueue.cpp

@@ -98,7 +98,7 @@ ImportResult TransactionQueue::import(Transaction const& _transaction, ImportCal
 std::unordered_map<h256, Transaction> TransactionQueue::transactions() const
 {
 	ReadGuard l(m_lock);
-	return m_current + m_future;
+	return m_current;
 }
 
 ImportResult TransactionQueue::manageImport_WITH_LOCK(h256 const& _h, Transaction const& _transaction, ImportCallback const& _cb)
@@ -109,7 +109,6 @@ ImportResult TransactionQueue::manageImport_WITH_LOCK(h256 const& _h, Transactio
 		// If it doesn't work, the signature is bad.
 		// The transaction's nonce may yet be invalid (or, it could be "valid" but we may be missing a marginally older transaction).
 
-
 		// Remove any prior transaction with the same nonce but a lower gas price.
 		// Bomb out if there's a prior transaction with higher gas price.
 		auto r = m_senders.equal_range(_transaction.from());

test/libethereum/gaspricer.cpp

@@ -20,10 +20,9 @@
  */
 
 #include <libtestutils/BlockChainLoader.h>
-#include <libethereum/State.h>
 #include <libethereum/BlockChain.h>
-#include <libethereum/Client.h>
-#include <libdevcore/TransientDirectory.h>
+#include <libethereum/GasPricer.h>
+#include <libethereum/BasicGasPricer.h>
 #include "../TestHelper.h"
 
 using namespace std;