Merge remote-tracking branch 'upstream/develop' into suicideRefundTests

This commit is contained in:
CJentzsch 2015-03-07 22:33:03 +01:00
commit 8172e11f1a

View File

@ -87,7 +87,7 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
// get txs
TransactionQueue txs;
GasPricer gp(10000);
TrivialGasPricer gp;
BOOST_REQUIRE(blObj.count("transactions"));
for (auto const& txObj: blObj["transactions"].get_array())
{