From 580a0e4a2c92ca62c9c9f2613a67f330d3efa209 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethereum.org>
Date: Tue, 2 Oct 2018 20:51:32 +0300
Subject: fix yml tests

---
 .../stArgsZeroOneBalance/jumpNonConstFiller.yml                       | 4 ++--
 .../stArgsZeroOneBalance/jumpiNonConstFiller.yml                      | 4 ++--
 .../stArgsZeroOneBalance/sloadNonConstFiller.yml                      | 4 ++--
 .../stArgsZeroOneBalance/sstoreNonConstFiller.yml                     | 4 ++--
 .../stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml             | 4 ++--
 test.py                                                               | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpNonConstFiller.yml
index 98fb9335f..ed3a520c8 100644
--- 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
index 93daaf8f0..3b964b517 100644
--- 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
index 1b1bdb0b0..18d18a90f 100644
--- 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
index bef68eba5..89536854a 100644
--- 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
index 7d4818047..679fb25da 100644
--- 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
@@ -30,7 +30,7 @@ CREATE_ContractRETURNBigOffset:
        a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
          nonce: '1'
        6295ee1b4f6dd65047762f924ecd367c17eabf8f:
-         nonce: 0
+         nonce: '0'
   pre:
     a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
       balance: '100000000000'
diff --git a/test.py b/test.py
index 03cc9f942..0189859ad 100755
--- 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:
-- 
cgit