aboutsummaryrefslogtreecommitdiffstats
path: root/src/BlockchainTestsFiller/bcUncleTest
diff options
context:
space:
mode:
authorYoichi Hirai <i@yoichihirai.com>2017-08-17 20:12:42 +0800
committerGitHub <noreply@github.com>2017-08-17 20:12:42 +0800
commit70e5862eb267226ca89fb9f395c97be1fdf6923a (patch)
treec241111dde1f83da444a749e8c19e83feb368dc0 /src/BlockchainTestsFiller/bcUncleTest
parent85f6d7cc01b6bd04e071f5ba579fc675cfd2043b (diff)
parent8d668d9b4c21f7b4024ca30093729f226da61640 (diff)
downloadtangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar
tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.gz
tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.bz2
tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.lz
tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.xz
tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.tar.zst
tangerine-tests-70e5862eb267226ca89fb9f395c97be1fdf6923a.zip
Merge pull request #262 from ethereum/eip96-to-constantinople
Move EIP96 to Constantinople
Diffstat (limited to 'src/BlockchainTestsFiller/bcUncleTest')
-rw-r--r--src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json5
-rw-r--r--src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json
index 7fe1ec8b9..209cf7dc1 100644
--- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json
+++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2Filler.json
@@ -19,7 +19,7 @@
},
"expect" : [
{
- "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
+ "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "20"
@@ -30,7 +30,7 @@
}
},
{
- "network" : ["Byzantium", "Constantinople"],
+ "network" : ["Constantinople"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "10"
@@ -66,7 +66,6 @@
]
},
{
- "expectExceptionByzantium" : "InvalidStateRoot",
"expectExceptionConstantinople" : "InvalidStateRoot",
"blockHeader" : {
"stateRoot" : "6ff22555fde6fe93e5b412a8691287a5be5708246adfd0c599604849925fcc34",
diff --git a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json
index abcd5d02a..1246d6298 100644
--- a/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json
+++ b/src/BlockchainTestsFiller/bcUncleTest/uncleHeaderAtBlock2MetropolisFiller.json
@@ -19,7 +19,7 @@
},
"expect" : [
{
- "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
+ "network" : ["Frontier", "Homestead", "EIP150", "EIP158", "Byzantium"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "10"
@@ -30,7 +30,7 @@
}
},
{
- "network" : ["Byzantium", "Constantinople"],
+ "network" : ["Constantinople"],
"result" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "20"
@@ -70,6 +70,7 @@
"expectExceptionHomestead" : "InvalidStateRoot",
"expectExceptionEIP150" : "InvalidStateRoot",
"expectExceptionEIP158" : "InvalidStateRoot",
+ "expectExceptionByzantium" : "InvalidStateRoot",
"blockHeader" : {
"stateRoot" : "187f42cfebad21c551446195f12bfae8e95b3005a18d9ad2668f9c1f729b2662",
"updatePoW" : "1"