cerc-io/solidity
10
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

add possibility to have in-chain uncles as tests

Browse Source
This commit is contained in:
CJentzsch 2015-03-23 13:08:14 +01:00
parent 5d910304b6
commit aab0ec0678
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
blockchain.cpp
View File

@ -72,6 +72,7 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
// create new "genesis" block // create new "genesis" block
RLPStream rlpGenesisBlock = createFullBlockFromHeader(biGenesisBlock); RLPStream rlpGenesisBlock = createFullBlockFromHeader(biGenesisBlock);
biGenesisBlock.verifyInternals(&rlpGenesisBlock.out()); biGenesisBlock.verifyInternals(&rlpGenesisBlock.out());
o["genesisRLP"] = "0x" + toHex(rlpGenesisBlock.out());
// construct blockchain // construct blockchain
BlockChain bc(rlpGenesisBlock.out(), string(), true); BlockChain bc(rlpGenesisBlock.out(), string(), true);
@ -114,6 +115,15 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
vBiUncles.push_back(vBiUncles[vBiUncles.size()-1]); vBiUncles.push_back(vBiUncles[vBiUncles.size()-1]);
continue; continue;
} }
if (uncleHeaderObj.count("sameAsBlock"))
{
writeBlockHeaderToJson(uncleHeaderObj_pre, vBiBlocks[(size_t)toInt(uncleHeaderObj["sameAsBlock"])]);
aUncleList.push_back(uncleHeaderObj_pre);
vBiUncles.push_back(vBiBlocks[(size_t)toInt(uncleHeaderObj["sameAsBlock"])]);
continue;
}
BlockInfo uncleBlockFromFields = constructBlock(uncleHeaderObj); BlockInfo uncleBlockFromFields = constructBlock(uncleHeaderObj);
// make uncle header valid // make uncle header valid