fix yml tests

ethereum · Oct 2, 2018 · c9bfc8e · c9bfc8e
1 parent f4e6c9d
commit c9bfc8e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpNonConstFiller.yml
@@ -17,7 +17,7 @@ jumpNonConst:
     result:
       095e7baea6a6c7c4c2dfeb977efac326af552d87:
         storage:
-          0x01: '0x00'
+          '0x01': '0x00'
   - indexes:
       data: !!int -1
       gas: !!int -1
@@ -27,7 +27,7 @@ jumpNonConst:
     result:
       095e7baea6a6c7c4c2dfeb977efac326af552d87:
         storage:
-          0x01: '0x00'
+          '0x01': '0x00'
   pre:
     095e7baea6a6c7c4c2dfeb977efac326af552d87:
       balance: ''

diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpiNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpiNonConstFiller.yml
@@ -17,7 +17,7 @@ jumpiNonConst:
     result:
       095e7baea6a6c7c4c2dfeb977efac326af552d87:
         storage:
-          0x01: '0x00'
+          '0x01': '0x00'
   - indexes:
       data: !!int -1
       gas: !!int -1
@@ -27,7 +27,7 @@ jumpiNonConst:
     result:
       095e7baea6a6c7c4c2dfeb977efac326af552d87:
         storage:
-          0x01: '0x00'
+          '0x01': '0x00'
   pre:
     095e7baea6a6c7c4c2dfeb977efac326af552d87:
       balance: ''

diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sloadNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sloadNonConstFiller.yml
@@ -17,7 +17,7 @@ sloadNonConst:
     result:
       095e7baea6a6c7c4c2dfeb977efac326af552d87:
         storage:
-          0x03: '0x00'
+          '0x03': '0x00'
   - indexes:
       data: !!int -1
       gas: !!int -1
@@ -27,7 +27,7 @@ sloadNonConst:
     result:
       095e7baea6a6c7c4c2dfeb977efac326af552d87:
         storage:
-          0x03: '0x00'
+          '0x03': '0x00'
   pre:
     095e7baea6a6c7c4c2dfeb977efac326af552d87:
       balance: ''

diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sstoreNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sstoreNonConstFiller.yml
@@ -17,7 +17,7 @@ sstoreNonConst:
     result:
       095e7baea6a6c7c4c2dfeb977efac326af552d87:
         storage:
-          0x01: '0x00'
+          '0x01': '0x00'
   - indexes:
       data: !!int -1
       gas: !!int -1
@@ -27,7 +27,7 @@ sstoreNonConst:
     result:
       095e7baea6a6c7c4c2dfeb977efac326af552d87:
         storage:
-          0x01: '0x01'
+          '0x01': '0x01'
   pre:
     095e7baea6a6c7c4c2dfeb977efac326af552d87:
       balance: ''

diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml
@@ -19,7 +19,7 @@ CREATE_ContractRETURNBigOffset:
        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
          nonce: '1'
        6295ee1b4f6dd65047762f924ecd367c17eabf8f:
-         shouldnotexist: 1
+         shouldnotexist: `1`
     - indexes:
        data: !!int -1
        gas: !!int -1

diff --git a/test.py b/test.py
@@ -134,7 +134,7 @@ def hashFile(fname):
     with open(fname ,"rb") as f:
         k = sha3.keccak_256()
         if fname.endswith(".json"):
-            s = json.dumps(json.load(f), separators=(',', ':'))
+            s = json.dumps(json.load(f), sort_keys=True, separators=(',', ':'))
         elif fname.endswith(".yml"):
             s = json.dumps(yaml.load(f), sort_keys=True, separators=(',', ':'))
         else: