diff options
| author | Gav Wood <g@ethdev.com> | 2015-03-24 15:59:42 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-03-24 15:59:42 +0800 |
| commit | 0b476774a2710169b1956a2a4c85aaf191b22f5c (patch) | |
| tree | 4a46f735fcf922bf823a12f2d5e6e22c6f9eed9e /blockchain.cpp | |
| parent | e6a1ca28e5ff0fa59b6e4f3f033c84fd76a111cf (diff) | |
| parent | 918e1e1738b4a5af80777ba88d5e75737a92dc9c (diff) | |
| download | dexon-solidity-0b476774a2710169b1956a2a4c85aaf191b22f5c.tar dexon-solidity-0b476774a2710169b1956a2a4c85aaf191b22f5c.tar.gz dexon-solidity-0b476774a2710169b1956a2a4c85aaf191b22f5c.tar.bz2 dexon-solidity-0b476774a2710169b1956a2a4c85aaf191b22f5c.tar.lz dexon-solidity-0b476774a2710169b1956a2a4c85aaf191b22f5c.tar.xz dexon-solidity-0b476774a2710169b1956a2a4c85aaf191b22f5c.tar.zst dexon-solidity-0b476774a2710169b1956a2a4c85aaf191b22f5c.zip | |
Merge pull request #1382 from CJentzsch/addTests
Add tests
Diffstat (limited to 'blockchain.cpp')
| -rw-r--r-- | blockchain.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/blockchain.cpp b/blockchain.cpp index 0f5eeaee..50ca22c5 100644 --- a/blockchain.cpp +++ b/blockchain.cpp @@ -72,6 +72,7 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin) // create new "genesis" block RLPStream rlpGenesisBlock = createFullBlockFromHeader(biGenesisBlock); biGenesisBlock.verifyInternals(&rlpGenesisBlock.out()); + o["genesisRLP"] = "0x" + toHex(rlpGenesisBlock.out()); // construct blockchain 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]); 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); // make uncle header valid |