diff options
| author | winsvega <winsvega@mail.ru> | 2015-01-23 07:48:15 +0800 |
|---|---|---|
| committer | winsvega <winsvega@mail.ru> | 2015-01-23 07:48:15 +0800 |
| commit | 0f7b1b33445ebc61b295da4fa0722c66158dc0d3 (patch) | |
| tree | 01f8aa4dc83aa66a5ed617b923851d351f83c096 | |
| parent | 7bf407dbe4cb0e2197c6ce626ceed69ac548b44e (diff) | |
| download | dexon-solidity-0f7b1b33445ebc61b295da4fa0722c66158dc0d3.tar dexon-solidity-0f7b1b33445ebc61b295da4fa0722c66158dc0d3.tar.gz dexon-solidity-0f7b1b33445ebc61b295da4fa0722c66158dc0d3.tar.bz2 dexon-solidity-0f7b1b33445ebc61b295da4fa0722c66158dc0d3.tar.lz dexon-solidity-0f7b1b33445ebc61b295da4fa0722c66158dc0d3.tar.xz dexon-solidity-0f7b1b33445ebc61b295da4fa0722c66158dc0d3.tar.zst dexon-solidity-0f7b1b33445ebc61b295da4fa0722c66158dc0d3.zip | |
transaction tests, bound tests
| -rw-r--r-- | stTransactionTestFiller.json | 93 | ||||
| -rw-r--r-- | transaction.cpp | 36 | ||||
| -rw-r--r-- | tt10mbDataFieldFiller.json | 17 | ||||
| -rw-r--r-- | ttTransactionTestFiller.json | 149 |
4 files changed, 268 insertions, 27 deletions
diff --git a/stTransactionTestFiller.json b/stTransactionTestFiller.json index c1c71a53..cd42af79 100644 --- a/stTransactionTestFiller.json +++ b/stTransactionTestFiller.json @@ -414,4 +414,97 @@ } }, + "TransactionNonceCheck" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "45678256", + "currentGasLimit" : "1000000", + "currentNumber" : "0", + "currentTimestamp" : 1, + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "pre" : + { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", + "code" : "", + "nonce" : "10", + "storage" : { + } + } + }, + "transaction" : + { + "data" : "", + "gasLimit" : "1000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "value" : "10" + } + }, + + "TransactionNonceCheck2" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "45678256", + "currentGasLimit" : "1000000", + "currentNumber" : "0", + "currentTimestamp" : 1, + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "pre" : + { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : + { + "data" : "", + "gasLimit" : "1000", + "gasPrice" : "1", + "nonce" : "10", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "value" : "10" + } + }, + + "TransactionCosts555" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "45678256", + "currentGasLimit" : "1000000", + "currentNumber" : "0", + "currentTimestamp" : 1, + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "pre" : + { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "100000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : + { + "data" : "0x00000000000000000000112233445566778f32", + "gasLimit" : "1000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "value" : "0" + } + }, + } diff --git a/transaction.cpp b/transaction.cpp index db66b33e..f43116b4 100644 --- a/transaction.cpp +++ b/transaction.cpp @@ -16,19 +16,10 @@ */ /** @file transaction.cpp * @author Dmitrii Khokhlov <winsvega@mail.ru> - * @date 2014 + * @date 2015 * Transaaction test functions. */ -#include <boost/filesystem/operations.hpp> -#include <boost/test/unit_test.hpp> -#include "JsonSpiritHeaders.h" -#include <libdevcore/CommonIO.h> -#include <libethereum/BlockChain.h> -#include <libethereum/State.h> -#include <libethereum/ExtVM.h> -#include <libethereum/Defaults.h> -#include <libevm/VM.h> #include "TestHelper.h" using namespace std; @@ -55,16 +46,15 @@ Transaction createTransactionFromFields(mObject& _tObj) //Construct Rlp of the given transaction RLPStream rlpStream; rlpStream.appendList(9); - rlpStream << toInt(_tObj["nonce"]) << toInt(_tObj["gasPrice"]) << toInt(_tObj["gasLimit"]); + rlpStream << bigint(_tObj["nonce"].get_str()) << bigint(_tObj["gasPrice"].get_str()) << bigint(_tObj["gasLimit"].get_str()); if (_tObj["to"].get_str().empty()) rlpStream << ""; else rlpStream << Address(_tObj["to"].get_str()); - rlpStream << toInt(_tObj["value"]) << importData(_tObj); - + rlpStream << bigint(_tObj["value"].get_str()) << importData(_tObj); u256 r = h256(fromHex(_tObj["r"].get_str())); u256 s = h256(fromHex(_tObj["s"].get_str())); - rlpStream << toInt(_tObj["v"]) << r << s; + rlpStream << bigint(_tObj["v"].get_str()) << r << s; return Transaction(rlpStream.out(), true); } @@ -124,13 +114,13 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin) rlpStream.appendList(tObj.size()); if(tObj.count("nonce") > 0) - rlpStream << toInt(tObj["nonce"]); + rlpStream << bigint(tObj["nonce"].get_str()); if(tObj.count("gasPrice") > 0) - rlpStream << toInt(tObj["gasPrice"]); + rlpStream << bigint(tObj["gasPrice"].get_str()); if(tObj.count("gasLimit") > 0) - rlpStream << toInt(tObj["gasLimit"]); + rlpStream << bigint(tObj["gasLimit"].get_str()); if(tObj.count("to") > 0) { @@ -141,14 +131,14 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin) } if(tObj.count("value") > 0) - rlpStream << toInt(tObj["value"]); + rlpStream << bigint(tObj["value"].get_str()); if(tObj.count("data") > 0) rlpStream << importData(tObj); if(tObj.count("v") > 0) - rlpStream << toInt(tObj["v"]); + rlpStream << bigint(tObj["v"].get_str()); if(tObj.count("r") > 0) { @@ -163,7 +153,7 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin) } if(tObj.count("extrafield") > 0) - rlpStream << toInt(tObj["extrafield"]); + rlpStream << bigint(tObj["extrafield"].get_str()); o["rlp"] = "0x" + toHex(rlpStream.out()); @@ -174,7 +164,6 @@ void doTransactionTests(json_spirit::mValue& _v, bool _fillin) BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("transaction from RLP signature is invalid") ); o["sender"] = toString(txFromFields.sender()); - } catch(...) { @@ -194,6 +183,11 @@ BOOST_AUTO_TEST_CASE(ttFillerTest) dev::test::executeTests("ttTransactionTest", "/TransactionTests", dev::test::doTransactionTests); } +BOOST_AUTO_TEST_CASE(ttDataStringTest) +{ + dev::test::executeTests("tt10mbDataField", "/TransactionTests", dev::test::doTransactionTests); +} + BOOST_AUTO_TEST_CASE(ttCreateTest) { for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i) diff --git a/tt10mbDataFieldFiller.json b/tt10mbDataFieldFiller.json new file mode 100644 index 00000000..11979f96 --- /dev/null +++ b/tt10mbDataFieldFiller.json @@ -0,0 +1,17 @@ +{ + "String10MbData" : + { + "transaction" : + { |