cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix import transaction

Browse Source
This commit is contained in:
CJentzsch 2015-02-13 10:59:47 +01:00
parent 6d5d7b5124
commit fa5c4c8857
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
block.cpp
View File

@ -157,6 +157,8 @@ void doBlockTests(json_spirit::mValue& _v, bool _fillin)
// construct blockchain // construct blockchain
BlockChain bc(block.out(), string(), true); BlockChain bc(block.out(), string(), true);
cout << "constructed bc\n";
if (_fillin) if (_fillin)
{ {
BOOST_REQUIRE(o.count("transactions") > 0); BOOST_REQUIRE(o.count("transactions") > 0);
@ -260,9 +262,13 @@ void doBlockTests(json_spirit::mValue& _v, bool _fillin)
try try
{ {
state.sync(bc); state.sync(bc);
cout << "synced bc\n";
bytes blockRLP = importByteArray(o["rlp"].get_str()); bytes blockRLP = importByteArray(o["rlp"].get_str());
cout << "imported rlp bc\n";
bc.import(blockRLP, state.db()); bc.import(blockRLP, state.db());
cout << "imported rlp to bc bc\n";
state.sync(bc); state.sync(bc);
cout << "synced state bc\n";
} }
// if exception is thrown, RLP is invalid and no blockHeader, Transaction list, or Uncle list should be given // if exception is thrown, RLP is invalid and no blockHeader, Transaction list, or Uncle list should be given
catch (Exception const& _e) catch (Exception const& _e)
@ -316,6 +322,8 @@ void doBlockTests(json_spirit::mValue& _v, bool _fillin)
BOOST_CHECK_MESSAGE(blockHeaderFromFields == blockFromRlp, "However, blockHeaderFromFields != blockFromRlp!"); BOOST_CHECK_MESSAGE(blockHeaderFromFields == blockFromRlp, "However, blockHeaderFromFields != blockFromRlp!");
cout << "checked block header bc\n";
//Check transaction list //Check transaction list
Transactions txsFromField; Transactions txsFromField;
@ -323,6 +331,9 @@ void doBlockTests(json_spirit::mValue& _v, bool _fillin)
for (auto const& txObj: o["transactions"].get_array()) for (auto const& txObj: o["transactions"].get_array())
{ {
mObject tx = txObj.get_obj(); mObject tx = txObj.get_obj();
cout << "read single tx\n";
BOOST_REQUIRE(tx.count("nonce") > 0); BOOST_REQUIRE(tx.count("nonce") > 0);
BOOST_REQUIRE(tx.count("gasPrice") > 0); BOOST_REQUIRE(tx.count("gasPrice") > 0);
BOOST_REQUIRE(tx.count("gasLimit") > 0); BOOST_REQUIRE(tx.count("gasLimit") > 0);
@ -333,10 +344,25 @@ void doBlockTests(json_spirit::mValue& _v, bool _fillin)
BOOST_REQUIRE(tx.count("s") > 0); BOOST_REQUIRE(tx.count("s") > 0);
BOOST_REQUIRE(tx.count("data") > 0); BOOST_REQUIRE(tx.count("data") > 0);
Transaction t(createRLPStreamFromTransactionFields(tx).out(), CheckSignature::Sender); cout << "construct single tx\n";
txsFromField.push_back(t); try
{
Transaction t(createRLPStreamFromTransactionFields(tx).out(), CheckSignature::Sender);
txsFromField.push_back(t);
}
catch (Exception const& _e)
{
BOOST_ERROR("Failed transaction constructor with Exception: " << diagnostic_information(_e));
}
catch (exception const& _e)
{
cout << _e.what() << endl;
}
} }
cout << "read txs bc\n";
Transactions txsFromRlp; Transactions txsFromRlp;
bytes blockRLP = importByteArray(o["rlp"].get_str()); bytes blockRLP = importByteArray(o["rlp"].get_str());
RLP root(blockRLP); RLP root(blockRLP);
@ -362,6 +388,7 @@ void doBlockTests(json_spirit::mValue& _v, bool _fillin)
BOOST_CHECK_MESSAGE(txsFromField[i] == txsFromRlp[i], "however, transactions in rlp and in field do not match"); BOOST_CHECK_MESSAGE(txsFromField[i] == txsFromRlp[i], "however, transactions in rlp and in field do not match");
} }
cout << "checked txs bc\n";
// check uncle list // check uncle list