diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-03-11 15:33:52 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-03-11 15:33:52 +0800 |
| commit | 68db4681c0ff2a0c724512edac5abe1fb5341444 (patch) | |
| tree | f5528939cd3d4b1cadc9b409d6d062cb190ea07a /TestHelper.h | |
| parent | 57e6fb303dd65212855ea69f2bd25358f0379526 (diff) | |
| parent | e9db858ccabbdaa90ed721065b7ace48d3e34bd5 (diff) | |
| download | dexon-solidity-68db4681c0ff2a0c724512edac5abe1fb5341444.tar dexon-solidity-68db4681c0ff2a0c724512edac5abe1fb5341444.tar.gz dexon-solidity-68db4681c0ff2a0c724512edac5abe1fb5341444.tar.bz2 dexon-solidity-68db4681c0ff2a0c724512edac5abe1fb5341444.tar.lz dexon-solidity-68db4681c0ff2a0c724512edac5abe1fb5341444.tar.xz dexon-solidity-68db4681c0ff2a0c724512edac5abe1fb5341444.tar.zst dexon-solidity-68db4681c0ff2a0c724512edac5abe1fb5341444.zip | |
Merge branch 'develop' into new_jsonrpc
Diffstat (limited to 'TestHelper.h')
| -rw-r--r-- | TestHelper.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/TestHelper.h b/TestHelper.h index 0f23f945..d378848a 100644 --- a/TestHelper.h +++ b/TestHelper.h @@ -117,6 +117,13 @@ private: json_spirit::mObject& m_TestObject; }; +class ZeroGasPricer: public eth::GasPricer +{ +protected: + u256 ask(eth::State const&) const override { return 0; } + u256 bid(eth::TransactionPriority = eth::TransactionPriority::Medium) const override { return 0; } +}; + // helping functions u256 toInt(json_spirit::mValue const& _v); byte toByte(json_spirit::mValue const& _v); @@ -136,6 +143,7 @@ void userDefinedTest(std::string testTypeFlag, std::function<void(json_spirit::m RLPStream createRLPStreamFromTransactionFields(json_spirit::mObject& _tObj); void processCommandLineOptions(); eth::LastHashes lastHashes(u256 _currentBlockNumber); +json_spirit::mObject fillJsonWithState(eth::State _state); template<typename mapType> void checkAddresses(mapType& _expectedAddrs, mapType& _resultAddrs) |