aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Jentzsch <jentzsch.software@gmail.com>2014-11-07 21:10:00 +0800
committerChristoph Jentzsch <jentzsch.software@gmail.com>2014-11-07 21:10:00 +0800
commitdbcce8b7b95a513e0f8b8b3a6433771af3a7bd9e (patch)
treef605e37e24aa1f25e4aff3ed9fb6a76f3bcd6e57
parentf88f5a7702e0ede7603332f4d31d701b7d0d715b (diff)
downloaddexon-solidity-dbcce8b7b95a513e0f8b8b3a6433771af3a7bd9e.tar.gz
dexon-solidity-dbcce8b7b95a513e0f8b8b3a6433771af3a7bd9e.tar.zst
dexon-solidity-dbcce8b7b95a513e0f8b8b3a6433771af3a7bd9e.zip
Clean up state tests
-rw-r--r--TestHelper.h1
-rw-r--r--state.cpp14
-rw-r--r--tmpFiller.json44
3 files changed, 0 insertions, 59 deletions
diff --git a/TestHelper.h b/TestHelper.h
index 622b83ac..a4eb64d8 100644
--- a/TestHelper.h
+++ b/TestHelper.h
@@ -57,7 +57,6 @@ public:
eth::State m_statePost;
eth::ExtVMFace m_environment;
eth::Transaction m_transaction;
- bytes code;
private:
json_spirit::mObject& m_TestObject;
diff --git a/state.cpp b/state.cpp
index 4034b4b7..93586905 100644
--- a/state.cpp
+++ b/state.cpp
@@ -55,12 +55,6 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
ImportTest importer(o, _fillin);
- if (_fillin)
- {
- importer.code = importer.m_statePre.code(importer.m_environment.myAddress);
- importer.m_environment.code = importer.code;
- }
-
State theState = importer.m_statePre;
bytes tx = importer.m_transaction.rlp();
bytes output;
@@ -124,12 +118,4 @@ BOOST_AUTO_TEST_CASE(stSystemOperationsTest)
dev::test::executeTests("stSystemOperationsTest", "/StateTests", dev::test::doStateTests);
}
-BOOST_AUTO_TEST_CASE(tmp)
-{
- int currentVerbosity = g_logVerbosity;
- g_logVerbosity = 12;
- dev::test::executeTests("tmp", "/StateTests", dev::test::doStateTests);
- g_logVerbosity = currentVerbosity;
-}
-
BOOST_AUTO_TEST_SUITE_END()
diff --git a/tmpFiller.json b/tmpFiller.json
deleted file mode 100644
index bd27b890..00000000
--- a/tmpFiller.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "ABAcalls0": {
- "env" : {
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
- "currentNumber" : "0",
- "currentGasLimit" : "10000000",
- "currentDifficulty" : "256",
- "currentTimestamp" : 1,
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
- },
- "pre" : {
- "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
- "balance" : "1000000000000000000",
- "nonce" : 0,
- "code" : "{ [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) }",
- "storage": {}
- },
- "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
- "balance" : "23",
- "code" : " { [[ (PC) ]] (ADD 1 (CALL 500 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) } ",
- "nonce" : "0",
- "storage" : {
- }
- },
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "1000000000000000000",
- "nonce" : 0,
- "code" : "",
- "storage": {}
- }
-
- },
- "transaction" : {
- "nonce" : "0",
- "gasPrice" : "1",
- "gasLimit" : "10000",
- "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
- "value" : "100000",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "data" : ""
- }
- }
-
-}