diff options
| author | yann300 <yann.levreau@gmail.com> | 2015-04-28 19:46:12 +0800 |
|---|---|---|
| committer | yann300 <yann.levreau@gmail.com> | 2015-04-28 19:46:12 +0800 |
| commit | 2172fbaab2e809099a778371fd9fdf5910b0bd03 (patch) | |
| tree | c98bcd0b8dee936419825d80e582e0e2c291ae9e /TestHelper.h | |
| parent | 145e0031b82c662f2ce4ab03a77ae2ff5f80574c (diff) | |
| parent | 717f2559696380c51d39cbf0105785c85ce3f3cf (diff) | |
| download | dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.gz dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.bz2 dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.lz dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.xz dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.zst dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.zip | |
Merge remote-tracking branch 'up/develop' into bugFix2
Conflicts:
test/webthreestubclient.h
Diffstat (limited to 'TestHelper.h')
| -rw-r--r-- | TestHelper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/TestHelper.h b/TestHelper.h index bf4cdc16..10e76aa9 100644 --- a/TestHelper.h +++ b/TestHelper.h @@ -161,6 +161,7 @@ void userDefinedTest(std::string testTypeFlag, std::function<void(json_spirit::m RLPStream createRLPStreamFromTransactionFields(json_spirit::mObject& _tObj); eth::LastHashes lastHashes(u256 _currentBlockNumber); json_spirit::mObject fillJsonWithState(eth::State _state); +json_spirit::mObject fillJsonWithTransaction(eth::Transaction _txn); template<typename mapType> void checkAddresses(mapType& _expectedAddrs, mapType& _resultAddrs) |