diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-04-17 18:50:33 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-04-17 18:50:33 +0800 |
| commit | 7219642569ab22a97bd1bdae1d0b67d3bcc6f69d (patch) | |
| tree | d706f18bd14a220b7bc3cc75d586ea7ac1cc79f5 | |
| parent | 6803c4f2db4ace4c1c07a1d05c4ba4a0ce7794dd (diff) | |
| parent | 3c353e2d0ed66117793864977c3de84a371f8d28 (diff) | |
| download | dexon-solidity-7219642569ab22a97bd1bdae1d0b67d3bcc6f69d.tar dexon-solidity-7219642569ab22a97bd1bdae1d0b67d3bcc6f69d.tar.gz dexon-solidity-7219642569ab22a97bd1bdae1d0b67d3bcc6f69d.tar.bz2 dexon-solidity-7219642569ab22a97bd1bdae1d0b67d3bcc6f69d.tar.lz dexon-solidity-7219642569ab22a97bd1bdae1d0b67d3bcc6f69d.tar.xz dexon-solidity-7219642569ab22a97bd1bdae1d0b67d3bcc6f69d.tar.zst dexon-solidity-7219642569ab22a97bd1bdae1d0b67d3bcc6f69d.zip | |
Merge branch 'develop' into discoveryEndpoints
| -rw-r--r-- | TestHelper.cpp | 32 | ||||
| -rw-r--r-- | TestHelper.h | 1 | ||||
| -rw-r--r-- | blockchain.cpp | 18 | ||||
| -rw-r--r-- | peer.cpp | 6 | ||||
| -rw-r--r-- | stQuadraticComplexityTestFiller.json | 2 | ||||
| -rw-r--r-- | stTransactionTestFiller.json | 78 | ||||
| -rw-r--r-- | transaction.cpp | 3 | ||||
| -rw-r--r-- | tt10mbDataFieldFiller.json | 3 | ||||
| -rw-r--r-- | ttTransactionTestFiller.json | 2 | ||||
| -rw-r--r-- | vm.cpp | 4 |
10 files changed, 96 insertions, 53 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 93c564e6..92a8258a 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -119,6 +119,32 @@ ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller): } } +json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) +{ + static const set<string> hashes {"bloom" , "coinbase", "hash", "mixHash", "parentHash", "receiptTrie", + "stateRoot", "transactionsTrie", "uncleHash", "currentCoinbase", + "previousHash", "to", "address", "caller", "origin", "secretKey"}; + + for (auto& i: _o) + { + std::string key = i.first; + if (hashes.count(key)) + continue; + + std::string str; + json_spirit::mValue value = i.second; + + if (value.type() == json_spirit::int_type) + str = toString(value.get_int()); + else if (value.type() == json_spirit::str_type) + str = value.get_str(); + else continue; + + _o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str))); + } + return _o; +} + void ImportTest::importEnv(json_spirit::mObject& _o) { assert(_o.count("previousHash") > 0); @@ -325,6 +351,8 @@ void ImportTest::exportTest(bytes const& _output, State const& _statePost) // export pre state m_TestObject["pre"] = fillJsonWithState(m_statePre); + m_TestObject["env"] = makeAllFieldsHex(m_TestObject["env"].get_obj()); + m_TestObject["transaction"] = makeAllFieldsHex(m_TestObject["transaction"].get_obj()); } json_spirit::mObject fillJsonWithState(State _state) @@ -335,8 +363,8 @@ json_spirit::mObject fillJsonWithState(State _state) for (auto const& a: _state.addresses()) { json_spirit::mObject o; - o["balance"] = toString(_state.balance(a.first)); - o["nonce"] = toString(_state.transactionsFrom(a.first)); + o["balance"] = "0x" + toHex(toCompactBigEndian(_state.balance(a.first))); + o["nonce"] = "0x" + toHex(toCompactBigEndian(_state.transactionsFrom(a.first))); { json_spirit::mObject store; for (auto const& s: _state.storage(a.first)) diff --git a/TestHelper.h b/TestHelper.h index 92745bc3..36a84ecd 100644 --- a/TestHelper.h +++ b/TestHelper.h @@ -121,6 +121,7 @@ public: static void importState(json_spirit::mObject& _o, eth::State& _state); static void importState(json_spirit::mObject& _o, eth::State& _state, stateOptionsMap& _stateOptionsMap); void importTransaction(json_spirit::mObject& _o); + static json_spirit::mObject& makeAllFieldsHex(json_spirit::mObject& _o); void exportTest(bytes const& _output, eth::State const& _statePost); static void checkExpectedState(eth::State const& _stateExpect, eth::State const& _statePost, stateOptionsMap const _expectedStateOptions = stateOptionsMap(), WhenError _throw = WhenError::Throw); diff --git a/blockchain.cpp b/blockchain.cpp index 4aa70c63..b144abe6 100644 --- a/blockchain.cpp +++ b/blockchain.cpp @@ -90,7 +90,7 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin) for (auto const& bl: o["blocks"].get_array()) { mObject blObj = bl.get_obj(); - stateTemp = state; + // get txs TransactionQueue txs; ZeroGasPricer gp; @@ -222,6 +222,7 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin) txObject["v"] = to_string(txi.second.signature().v + 27); txObject["to"] = txi.second.isCreation() ? "" : toString(txi.second.receiveAddress()); txObject["value"] = toString(txi.second.value()); + txObject = ImportTest::makeAllFieldsHex(txObject); txArray.push_back(txObject); } @@ -301,6 +302,11 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin) o["blocks"] = blArray; o["postState"] = fillJsonWithState(state); + + //make all values hex + State prestate(OverlayDB(), BaseState::Empty, biGenesisBlock.coinbaseAddress); + importer.importState(o["pre"].get_obj(), prestate); + o["pre"] = fillJsonWithState(prestate); }//_fillin else @@ -619,11 +625,11 @@ void writeBlockHeaderToJson(mObject& _o, BlockInfo const& _bi) _o["transactionsTrie"] = toString(_bi.transactionsRoot); _o["receiptTrie"] = toString(_bi.receiptsRoot); _o["bloom"] = toString(_bi.logBloom); - _o["difficulty"] = toString(_bi.difficulty); - _o["number"] = toString(_bi.number); - _o["gasLimit"] = toString(_bi.gasLimit); - _o["gasUsed"] = toString(_bi.gasUsed); - _o["timestamp"] = toString(_bi.timestamp); + _o["difficulty"] = "0x" + toHex(toCompactBigEndian(_bi.difficulty)); + _o["number"] = "0x" + toHex(toCompactBigEndian(_bi.number)); + _o["gasLimit"] = "0x" + toHex(toCompactBigEndian(_bi.gasLimit)); + _o["gasUsed"] = "0x" + toHex(toCompactBigEndian(_bi.gasUsed)); + _o["timestamp"] = "0x" + toHex(toCompactBigEndian(_bi.timestamp)); _o["extraData"] ="0x" + toHex(_bi.extraData); _o["mixHash"] = toString(_bi.mixHash); _o["nonce"] = toString(_bi.nonce); @@ -108,6 +108,12 @@ BOOST_AUTO_TEST_CASE(save_nodes) BOOST_REQUIRE(r[0].toInt<unsigned>() == dev::p2p::c_protocolVersion); BOOST_REQUIRE_EQUAL(r[1].toBytes().size(), 32); // secret BOOST_REQUIRE_EQUAL(r[2].itemCount(), 5); + + for (auto i: r[2]) + { + BOOST_REQUIRE(i.itemCount() == 3 || i.itemCount() == 10); + BOOST_REQUIRE(i[0].itemCount() == 4 || i[0].itemCount() == 16); + } } BOOST_AUTO_TEST_SUITE_END() diff --git a/stQuadraticComplexityTestFiller.json b/stQuadraticComplexityTestFiller.json index d58a04ae..281a5980 100644 --- a/stQuadraticComplexityTestFiller.json +++ b/stQuadraticComplexityTestFiller.json @@ -43,7 +43,7 @@ }, "transaction" : { - "//" : "run(int256)", + "data" : "run(int256)", "data" : "0x61a47706000000000000000000000000000000000000000000000000000000000000c350", "gasLimit" : "904+68*x+e", "gasLimit" : "350000000", diff --git a/stTransactionTestFiller.json b/stTransactionTestFiller.json index 70d329d6..9bd73b54 100644 --- a/stTransactionTestFiller.json +++ b/stTransactionTestFiller.json @@ -5,7 +5,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -42,7 +42,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -85,7 +85,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -128,7 +128,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -167,7 +167,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -207,7 +207,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -280,7 +280,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1100", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -316,7 +316,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "22000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -370,7 +370,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "47766", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -424,7 +424,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "220000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -479,7 +479,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "21100", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -515,7 +515,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "21100", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -552,7 +552,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "10000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -609,7 +609,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "100000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -678,7 +678,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -761,7 +761,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -834,7 +834,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "10000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -925,7 +925,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "10000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1003,7 +1003,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1056,7 +1056,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1110,7 +1110,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1170,7 +1170,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "10000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1226,7 +1226,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "100000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1284,7 +1284,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1333,7 +1333,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "post" : { @@ -1381,7 +1381,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1417,7 +1417,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "100000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1453,7 +1453,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "10000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1490,7 +1490,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "10000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1533,7 +1533,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "100000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1570,7 +1570,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "10000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1613,7 +1613,7 @@ "currentGasLimit" : "(2**256)-1", "currentGasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639935", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1655,7 +1655,7 @@ "currentGasLimit" : "(2**256)-1", "currentGasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639935", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1695,7 +1695,7 @@ "currentGasLimit" : "(2**256)-1", "currentGasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639935", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1733,7 +1733,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "100000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1769,7 +1769,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1806,7 +1806,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1846,7 +1846,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { @@ -1894,7 +1894,7 @@ "currentDifficulty" : "45678256", "currentGasLimit" : "1000000000000", "currentNumber" : "0", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "expect" : { diff --git a/transaction.cpp b/transaction.cpp index b87cc37e..78a1ac7f 100644 --- a/transaction.cpp +++ b/transaction.cpp @@ -51,7 +51,8 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin) if (!txFromFields.signature().isValid()) BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("transaction from RLP signature is invalid") ); - o["sender"] = toString(txFromFields.sender()); + o["sender"] = toString(txFromFields.sender()); + o["transaction"] = ImportTest::makeAllFieldsHex(tObj); } catch(Exception const& _e) { diff --git a/tt10mbDataFieldFiller.json b/tt10mbDataFieldFiller.json index 11979f96..d9900994 100644 --- a/tt10mbDataFieldFiller.json +++ b/tt10mbDataFieldFiller.json @@ -1,10 +1,11 @@ { "String10MbData" : { + "expect" : "valid", "transaction" : { |