Merge pull request #31 from CJentzsch/develop

Restructered tests in folders in accordance to test suites
ethereum · Nov 4, 2014 · 1c1ba8d · 1c1ba8d
2 parents 014d370 + 3aebe53
commit 1c1ba8d
Show file tree

Hide file tree

Showing 21 changed files with 64 additions and 1,985 deletions.
diff --git a/blockgenesistest.json → BasicTests/blockgenesistest.json b/blockgenesistest.json → BasicTests/blockgenesistest.json
diff --git a/genesishashestest.json → BasicTests/genesishashestest.json b/genesishashestest.json → BasicTests/genesishashestest.json
diff --git a/hexencodetest.json → BasicTests/hexencodetest.json b/hexencodetest.json → BasicTests/hexencodetest.json
diff --git a/keyaddrtest.json → BasicTests/keyaddrtest.json b/keyaddrtest.json → BasicTests/keyaddrtest.json
diff --git a/rlptest.json → BasicTests/rlptest.json b/rlptest.json → BasicTests/rlptest.json
diff --git a/txtest.json → BasicTests/txtest.json b/txtest.json → BasicTests/txtest.json
diff --git a/StateTests/stExample.json b/StateTests/stExample.json
@@ -0,0 +1,62 @@
+{
+    "add11" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "out" : "0x",
+        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000100000",
+                "code" : "0x6001600101600057",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x02"
+                }
+            },
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "804",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "999999999999899196",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x6001600101600057",
+                "nonce" : 0,
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000",
+                "code" : "",
+                "nonce" : 0,
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : "",
+            "gasLimit" : "10000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "100000"
+        }
+    }
+}
diff --git a/trietest.json → TrieTests/trietest.json b/trietest.json → TrieTests/trietest.json
diff --git a/trietestnextprev.json → TrieTests/trietestnextprev.json b/trietestnextprev.json → TrieTests/trietestnextprev.json
diff --git a/vmtests/vmArithmeticTest.json → VMTests/vmArithmeticTest.json b/vmtests/vmArithmeticTest.json → VMTests/vmArithmeticTest.json
@@ -3237,4 +3237,4 @@
             }
         }
     }
-}
+}
diff --git a/vmtests/vmBitwiseLogicOperationTest.json → VMTests/vmBitwiseLogicOperationTest.json b/vmtests/vmBitwiseLogicOperationTest.json → VMTests/vmBitwiseLogicOperationTest.json
diff --git a/vmtests/vmBlockInfoTest.json → VMTests/vmBlockInfoTest.json b/vmtests/vmBlockInfoTest.json → VMTests/vmBlockInfoTest.json
diff --git a/vmtests/vmEnvironmentalInfoTest.json → VMTests/vmEnvironmentalInfoTest.json b/vmtests/vmEnvironmentalInfoTest.json → VMTests/vmEnvironmentalInfoTest.json
diff --git a/vmtests/vmIOandFlowOperationsTest.json → VMTests/vmIOandFlowOperationsTest.json b/vmtests/vmIOandFlowOperationsTest.json → VMTests/vmIOandFlowOperationsTest.json
diff --git a/namecoin.json → VMTests/vmNamecoin.json b/namecoin.json → VMTests/vmNamecoin.json
@@ -25,7 +25,7 @@
             "gasPrice": "1000000000000"
         }, 
         "callcreates": [], 
-        "gas": "9763", 
+        "gas": "9663", 
         "env": {
             "currentTimestamp": "1405282164", 
             "currentGasLimit": "999023", 

diff --git a/vmtests/vmPushDupSwapTest.json → VMTests/vmPushDupSwapTest.json b/vmtests/vmPushDupSwapTest.json → VMTests/vmPushDupSwapTest.json
diff --git a/vmtests/vmSha3Test.json → VMTests/vmSha3Test.json b/vmtests/vmSha3Test.json → VMTests/vmSha3Test.json
diff --git a/vmtests/vmtests.json → VMTests/vmtests.json b/vmtests/vmtests.json → VMTests/vmtests.json
diff --git a/vmtests/random.json b/vmtests/random.json
diff --git a/vmtests/tmp.json b/vmtests/tmp.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -3237,4 +3237,4 @@ @@
                 }
             }
         }
-    }
+    }