diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-02 18:52:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-02 18:52:56 +0800 |
| commit | 64f35ba8d1f31d6821a0a1bf946c71396a996f30 (patch) | |
| tree | 375a081536c7c0b329a3b0c2e812ff05f81dd64c /tests/files/BasicTests/genesishashestest.json | |
| parent | 616066a598933df7ef126186eb9c647094f665ca (diff) | |
| parent | 99481a245adc2c4814ab6b38d94d63114f7bbb15 (diff) | |
| download | dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.gz dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.zst dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.zip | |
merge errors fixed
Diffstat (limited to 'tests/files/BasicTests/genesishashestest.json')
| -rw-r--r-- | tests/files/BasicTests/genesishashestest.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/files/BasicTests/genesishashestest.json b/tests/files/BasicTests/genesishashestest.json index 0ff3c3ed7..ba733e36e 100644 --- a/tests/files/BasicTests/genesishashestest.json +++ b/tests/files/BasicTests/genesishashestest.json @@ -1,5 +1,5 @@ { - "genesis_rlp_hex": "f9012ff9012aa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0c67c70f5d7d3049337d1dcc0503a249881120019a8e7322774dbfe57b463718ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b84000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", + "genesis_rlp_hex": "f9012ef90129a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0c67c70f5d7d3049337d1dcc0503a249881120019a8e7322774dbfe57b463718ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", "genesis_state_root": "c67c70f5d7d3049337d1dcc0503a249881120019a8e7322774dbfe57b463718c", "initial_alloc": { "51ba59315b3a95761d0863b05ccc7a7f54703d99": "1606938044258990275541962092341162602522202993782792835301376", @@ -11,5 +11,5 @@ "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" }, - "genesis_hash": "955f36d073ccb026b78ab3424c15cf966a7563aa270413859f78702b9e8e22cb" + "genesis_hash": "779b1b620b03c0fb24963e183d5e88e3dbe4484e3f6e2aa05942e3be7b48e179" } |