From 794bac50bc7cf4791aa78c870f5b2a6febc6c0cd Mon Sep 17 00:00:00 2001 From: Luke Schoen Date: Wed, 12 Jun 2019 06:01:03 +0200 Subject: [PATCH] revert: Restore indentation now handled by separate PR #10740 --- json/src/state/test.rs | 108 ++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/json/src/state/test.rs b/json/src/state/test.rs index b8e5f35f694..3521c797785 100644 --- a/json/src/state/test.rs +++ b/json/src/state/test.rs @@ -125,13 +125,13 @@ mod tests { #[test] fn multi_transaction_deserialization() { let s = r#"{ - "data": [ "" ], - "gasLimit": [ "0x2dc6c0", "0x222222" ], - "gasPrice": "0x01", - "nonce": "0x00", - "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to": "1000000000000000000000000000000000000000", - "value": [ "0x00", "0x01", "0x02" ] + "data" : [ "" ], + "gasLimit" : [ "0x2dc6c0", "0x222222" ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", + "value" : [ "0x00", "0x01", "0x02" ] }"#; let _deserialized: MultiTransaction = serde_json::from_str(s).unwrap(); } @@ -139,74 +139,74 @@ mod tests { #[test] fn state_deserialization() { let s = r#"{ - "env": { - "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty": "0x0100", - "currentGasLimit": "0x01c9c380", - "currentNumber": "0x00", - "currentTimestamp": "0x01", - "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x0100", + "currentGasLimit" : "0x01c9c380", + "currentNumber" : "0x00", + "currentTimestamp" : "0x01", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post": { - "EIP150": [ + "post" : { + "EIP150" : [ { - "hash": "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f", - "indexes": { "data": 0, "gas": 0, "value": 0 } + "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f", + "indexes" : { "data" : 0, "gas" : 0, "value" : 0 } }, { - "hash": "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764", - "indexes": { "data": 0, "gas": 0, "value": 1 } + "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764", + "indexes" : { "data" : 0, "gas" : 0, "value" : 1 } } ], - "EIP158": [ + "EIP158" : [ { - "hash": "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f", - "indexes": { "data": 0, "gas": 0, "value": 0 } + "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f", + "indexes" : { "data" : 0, "gas" : 0, "value" : 0 } }, { - "hash": "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764", - "indexes": { "data": 0, "gas": 0, "value": 1 } + "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764", + "indexes" : { "data" : 0, "gas" : 0, "value" : 1 } } ] }, - "pre": { - "1000000000000000000000000000000000000000": { - "balance": "0x0de0b6b3a7640000", - "code": "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055", - "nonce": "0x00", - "storage": { + "pre" : { + "1000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055", + "nonce" : "0x00", + "storage" : { } }, - "1000000000000000000000000000000000000001": { - "balance": "0x0de0b6b3a7640000", - "code": "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155", - "nonce": "0x00", - "storage": { + "1000000000000000000000000000000000000001" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155", + "nonce" : "0x00", + "storage" : { } }, - "1000000000000000000000000000000000000002": { - "balance": "0x00", - "code": "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055", - "nonce": "0x00", - "storage": { + "1000000000000000000000000000000000000002" : { + "balance" : "0x00", + "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055", + "nonce" : "0x00", + "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": { - "balance": "0x0de0b6b3a7640000", - "code": "0x", - "nonce": "0x00", - "storage": { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x", + "nonce" : "0x00", + "storage" : { } } }, - "transaction": { - "data": [ "" ], - "gasLimit": [ "285000", "100000", "6000" ], - "gasPrice": "0x01", - "nonce": "0x00", - "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to": "095e7baea6a6c7c4c2dfeb977efac326af552d87", - "value": [ "10", "0" ] + "transaction" : { + "data" : [ "" ], + "gasLimit" : [ "285000", "100000", "6000" ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "value" : [ "10", "0" ] } }"#; let _deserialized: State = serde_json::from_str(s).unwrap();