diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-04-17 15:03:10 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-04-17 15:03:10 +0800 |
| commit | aadffe35540d446a5723768abbe41ef841a98de6 (patch) | |
| tree | 24e50774fe43dae51a95121909aa4bb5dc3b97fd /stateOriginal.cpp | |
| parent | 3d199bf4d50206077c0d84122ff0ef70fc174d10 (diff) | |
| parent | 0f9b0f3bc4fbebb2ab956f0178ec82442065b1bc (diff) | |
| download | dexon-solidity-aadffe35540d446a5723768abbe41ef841a98de6.tar dexon-solidity-aadffe35540d446a5723768abbe41ef841a98de6.tar.gz dexon-solidity-aadffe35540d446a5723768abbe41ef841a98de6.tar.bz2 dexon-solidity-aadffe35540d446a5723768abbe41ef841a98de6.tar.lz dexon-solidity-aadffe35540d446a5723768abbe41ef841a98de6.tar.xz dexon-solidity-aadffe35540d446a5723768abbe41ef841a98de6.tar.zst dexon-solidity-aadffe35540d446a5723768abbe41ef841a98de6.zip | |
Merge remote-tracking branch 'upstream/develop' into addTests
Conflicts:
test/bcUncleHeaderValiditiyFiller.json
Diffstat (limited to 'stateOriginal.cpp')
| -rw-r--r-- | stateOriginal.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/stateOriginal.cpp b/stateOriginal.cpp index 572e84dc..e1a3c7c4 100644 --- a/stateOriginal.cpp +++ b/stateOriginal.cpp @@ -25,7 +25,9 @@ #include <secp256k1/secp256k1.h> #include <libethereum/CanonBlockChain.h> #include <libethereum/State.h> +#include <libethereum/Farm.h> #include <libethereum/Defaults.h> +#include "TestHelper.h" using namespace std; using namespace dev; using namespace dev::eth; @@ -67,9 +69,8 @@ BOOST_AUTO_TEST_CASE(Complex) cout << s; // Mine to get some ether! - s.commitToMine(bc); - while (!s.mine(100, true).completed) {} - s.completeMine(); + mine(s, bc); + bc.attemptImport(s.blockData(), stateDB); cout << bc; @@ -88,8 +89,7 @@ BOOST_AUTO_TEST_CASE(Complex) // Mine to get some ether and set in stone. s.commitToMine(bc); s.commitToMine(bc); - while (!s.mine(100, true).completed) {} - s.completeMine(); + mine(s, bc); bc.attemptImport(s.blockData(), stateDB); cout << bc; |