From 6d6282f66970d7bb091b94a3c8a98683f9b7cf80 Mon Sep 17 00:00:00 2001 From: Everett Hildenbrandt Date: Fri, 1 Jun 2018 00:52:50 -0600 Subject: src/VMTestsFiller: formatting changes --- .../TestNameRegistratorFiller.json | 52 +++++++++--------- .../vmSystemOperations/return0Filler.json | 56 ++++++++++--------- .../vmSystemOperations/return1Filler.json | 56 ++++++++++--------- .../vmSystemOperations/return2Filler.json | 56 ++++++++++--------- .../vmSystemOperations/suicide0Filler.json | 62 +++++++++++----------- .../suicideNotExistingAccountFiller.json | 62 +++++++++++----------- .../suicideSendEtherToMeFiller.json | 62 +++++++++++----------- 7 files changed, 197 insertions(+), 209 deletions(-) (limited to 'src/VMTestsFiller/vmSystemOperations') diff --git a/src/VMTestsFiller/vmSystemOperations/TestNameRegistratorFiller.json b/src/VMTestsFiller/vmSystemOperations/TestNameRegistratorFiller.json index 67a6e8d33..e089c573e 100644 --- a/src/VMTestsFiller/vmSystemOperations/TestNameRegistratorFiller.json +++ b/src/VMTestsFiller/vmSystemOperations/TestNameRegistratorFiller.json @@ -1,36 +1,36 @@ { "TestNameRegistrator": { - "env" : { - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "currentNumber" : "0", - "currentGasLimit" : "1000000", - "currentDifficulty" : "256", - "currentTimestamp" : "1", - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" + "env": { + "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty": "256", + "currentGasLimit": "1000000", + "currentNumber": "0", + "currentTimestamp": "1", + "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "storage" : { - "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" + "exec": { + "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "caller": "cd1722f3947def4cf144679da39c4c32bdc35681", + "data": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa", + "gas": "100000", + "gasPrice": "100000000000000", + "origin": "cd1722f3947def4cf144679da39c4c32bdc35681", + "value": "1000000000000000000" + }, + "expect": { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": { + "storage": { + "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" } } }, - "pre" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "100000000000000000000000", - "nonce" : "0", - "code" : "0x6000355415600957005b60203560003555", + "pre": { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": { + "balance": "100000000000000000000000", + "code": "0x6000355415600957005b60203560003555", + "nonce": "0", "storage": {} } - }, - "exec" : { - "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "1000000000000000000", - "data" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa", - "gasPrice" : "100000000000000", - "gas" : "100000" } } -} +} \ No newline at end of file diff --git a/src/VMTestsFiller/vmSystemOperations/return0Filler.json b/src/VMTestsFiller/vmSystemOperations/return0Filler.json index cffdc9393..e000d823d 100644 --- a/src/VMTestsFiller/vmSystemOperations/return0Filler.json +++ b/src/VMTestsFiller/vmSystemOperations/return0Filler.json @@ -1,38 +1,36 @@ { "return0": { - "env" : { - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "currentNumber" : "0", - "currentGasLimit" : "10000000", - "currentDifficulty" : "256", - "currentTimestamp" : "1", - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" + "env": { + "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty": "256", + "currentGasLimit": "10000000", + "currentNumber": "0", + "currentTimestamp": "1", + "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : { - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "storage" : { - "0x" : "0x3700000000000000000000000000000000000000000000000000000000000000" - } - } + "exec": { + "address": "cd1722f3947def4cf144679da39c4c32bdc35681", + "caller": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "data": "0xaa", + "gas": "100000", + "gasPrice": "100000000000000", + "origin": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "value": "23" }, - "pre" : { - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "balance" : "23", - "code" : "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 1)}", - "nonce" : "0", - "storage" : { + "expect": { + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "storage": { + "0x": "0x3700000000000000000000000000000000000000000000000000000000000000" } } - }, - "exec" : { - "address" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "value" : "23", - "data" : "0xaa", - "gasPrice" : "100000000000000", - "gas" : "100000" + "pre": { + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "balance": "23", + "code": "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 1)}", + "nonce": "0", + "storage": {} + } } } -} +} \ No newline at end of file diff --git a/src/VMTestsFiller/vmSystemOperations/return1Filler.json b/src/VMTestsFiller/vmSystemOperations/return1Filler.json index 4d82c7f5f..61e746481 100644 --- a/src/VMTestsFiller/vmSystemOperations/return1Filler.json +++ b/src/VMTestsFiller/vmSystemOperations/return1Filler.json @@ -1,38 +1,36 @@ { "return1": { - "env" : { - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "currentNumber" : "0", - "currentGasLimit" : "10000000", - "currentDifficulty" : "256", - "currentTimestamp" : "1", - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" + "env": { + "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty": "256", + "currentGasLimit": "10000000", + "currentNumber": "0", + "currentTimestamp": "1", + "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : { - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "storage" : { - "0x" : "0x3700000000000000000000000000000000000000000000000000000000000000" - } - } + "exec": { + "address": "cd1722f3947def4cf144679da39c4c32bdc35681", + "caller": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "data": "0xaa", + "gas": "100000", + "gasPrice": "100000000000000", + "origin": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "value": "23" }, - "pre" : { - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "balance" : "23", - "code" : "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 2)}", - "nonce" : "0", - "storage" : { + "expect": { + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "storage": { + "0x": "0x3700000000000000000000000000000000000000000000000000000000000000" } } - }, - "exec" : { - "address" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "value" : "23", - "data" : "0xaa", - "gasPrice" : "100000000000000", - "gas" : "100000" + "pre": { + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "balance": "23", + "code": "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 2)}", + "nonce": "0", + "storage": {} + } } } -} +} \ No newline at end of file diff --git a/src/VMTestsFiller/vmSystemOperations/return2Filler.json b/src/VMTestsFiller/vmSystemOperations/return2Filler.json index d1f889199..c9f79ecb5 100644 --- a/src/VMTestsFiller/vmSystemOperations/return2Filler.json +++ b/src/VMTestsFiller/vmSystemOperations/return2Filler.json @@ -1,38 +1,36 @@ { "return2": { - "env" : { - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "currentNumber" : "0", - "currentGasLimit" : "10000000", - "currentDifficulty" : "256", - "currentTimestamp" : "1", - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" + "env": { + "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty": "256", + "currentGasLimit": "10000000", + "currentNumber": "0", + "currentTimestamp": "1", + "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : { - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "storage" : { - "0x" : "0x3700000000000000000000000000000000000000000000000000000000000000" - } - } + "exec": { + "address": "cd1722f3947def4cf144679da39c4c32bdc35681", + "caller": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "data": "0xaa", + "gas": "100000", + "gasPrice": "100000000000000", + "origin": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "value": "23" }, - "pre" : { - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "balance" : "23", - "code" : "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 33)}", - "nonce" : "0", - "storage" : { + "expect": { + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "storage": { + "0x": "0x3700000000000000000000000000000000000000000000000000000000000000" } } - }, - "exec" : { - "address" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "value" : "23", - "data" : "0xaa", - "gasPrice" : "100000000000000", - "gas" : "100000" + "pre": { + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "balance": "23", + "code": "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 33)}", + "nonce": "0", + "storage": {} + } } } -} +} \ No newline at end of file diff --git a/src/VMTestsFiller/vmSystemOperations/suicide0Filler.json b/src/VMTestsFiller/vmSystemOperations/suicide0Filler.json index e58545374..54f2a96fc 100644 --- a/src/VMTestsFiller/vmSystemOperations/suicide0Filler.json +++ b/src/VMTestsFiller/vmSystemOperations/suicide0Filler.json @@ -1,42 +1,40 @@ { "suicide0": { - "env" : { - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "currentNumber" : "0", - "currentGasLimit" : "10000000", - "currentDifficulty" : "256", - "currentTimestamp" : "1", - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" + "env": { + "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty": "256", + "currentGasLimit": "10000000", + "currentNumber": "0", + "currentTimestamp": "1", + "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : { - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "balance" : "100000000000000000000023" + "exec": { + "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "caller": "cd1722f3947def4cf144679da39c4c32bdc35681", + "data": "", + "gas": "1000", + "gasPrice": "100000000000000", + "origin": "cd1722f3947def4cf144679da39c4c32bdc35681", + "value": "100000" + }, + "expect": { + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "balance": "100000000000000000000023" } }, - "pre" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "100000000000000000000000", - "nonce" : "0", - "code" : "{ (SELFDESTRUCT (CALLER))}", + "pre": { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": { + "balance": "100000000000000000000000", + "code": "{ (SELFDESTRUCT (CALLER))}", + "nonce": "0", "storage": {} }, - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "balance" : "23", - "code" : "0x6000355415600957005b60203560003555", - "nonce" : "0", - "storage" : { - } + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "balance": "23", + "code": "0x6000355415600957005b60203560003555", + "nonce": "0", + "storage": {} } - - }, - "exec" : { - "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "100000", - "data" : "", - "gasPrice" : "100000000000000", - "gas" : "1000" } } -} +} \ No newline at end of file diff --git a/src/VMTestsFiller/vmSystemOperations/suicideNotExistingAccountFiller.json b/src/VMTestsFiller/vmSystemOperations/suicideNotExistingAccountFiller.json index a37df98ab..30ec1aefb 100644 --- a/src/VMTestsFiller/vmSystemOperations/suicideNotExistingAccountFiller.json +++ b/src/VMTestsFiller/vmSystemOperations/suicideNotExistingAccountFiller.json @@ -1,42 +1,40 @@ { "suicideNotExistingAccount": { - "env" : { - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "currentNumber" : "0", - "currentGasLimit" : "10000000", - "currentDifficulty" : "256", - "currentTimestamp" : "1", - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" + "env": { + "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty": "256", + "currentGasLimit": "10000000", + "currentNumber": "0", + "currentTimestamp": "1", + "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : { - "aa1722f3947def4cf144679da39c4c32bdc35681" : { - "balance" : "100000000000000000000000" + "exec": { + "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "caller": "cd1722f3947def4cf144679da39c4c32bdc35681", + "data": "", + "gas": "1000", + "gasPrice": "100000000000000", + "origin": "cd1722f3947def4cf144679da39c4c32bdc35681", + "value": "100000" + }, + "expect": { + "aa1722f3947def4cf144679da39c4c32bdc35681": { + "balance": "100000000000000000000000" } }, - "pre" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "100000000000000000000000", - "nonce" : "0", - "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", + "pre": { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": { + "balance": "100000000000000000000000", + "code": "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", + "nonce": "0", "storage": {} }, - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "balance" : "23", - "code" : "0x6000355415600957005b60203560003555", - "nonce" : "0", - "storage" : { - } + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "balance": "23", + "code": "0x6000355415600957005b60203560003555", + "nonce": "0", + "storage": {} } - - }, - "exec" : { - "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "100000", - "data" : "", - "gasPrice" : "100000000000000", - "gas" : "1000" } } -} +} \ No newline at end of file diff --git a/src/VMTestsFiller/vmSystemOperations/suicideSendEtherToMeFiller.json b/src/VMTestsFiller/vmSystemOperations/suicideSendEtherToMeFiller.json index 203cba5ba..cf9f1ddd1 100644 --- a/src/VMTestsFiller/vmSystemOperations/suicideSendEtherToMeFiller.json +++ b/src/VMTestsFiller/vmSystemOperations/suicideSendEtherToMeFiller.json @@ -1,42 +1,40 @@ { "suicideSendEtherToMe": { - "env" : { - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", - "currentNumber" : "0", - "currentGasLimit" : "10000000", - "currentDifficulty" : "256", - "currentTimestamp" : "1", - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" + "env": { + "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty": "256", + "currentGasLimit": "10000000", + "currentNumber": "0", + "currentTimestamp": "1", + "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : { - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "balance" : "23" + "exec": { + "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "caller": "cd1722f3947def4cf144679da39c4c32bdc35681", + "data": "", + "gas": "1000", + "gasPrice": "100000000000000", + "origin": "cd1722f3947def4cf144679da39c4c32bdc35681", + "value": "100000" + }, + "expect": { + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "balance": "23" } }, - "pre" : { - "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { - "balance" : "100000000000000000000000", - "nonce" : "0", - "code" : "{ (SELFDESTRUCT (ADDRESS) )}", + "pre": { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": { + "balance": "100000000000000000000000", + "code": "{ (SELFDESTRUCT (ADDRESS) )}", + "nonce": "0", "storage": {} }, - "cd1722f3947def4cf144679da39c4c32bdc35681" : { - "balance" : "23", - "code" : "0x6000355415600957005b60203560003555", - "nonce" : "0", - "storage" : { - } + "cd1722f3947def4cf144679da39c4c32bdc35681": { + "balance": "23", + "code": "0x6000355415600957005b60203560003555", + "nonce": "0", + "storage": {} } - - }, - "exec" : { - "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", - "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", - "value" : "100000", - "data" : "", - "gasPrice" : "100000000000000", - "gas" : "1000" } } -} +} \ No newline at end of file -- cgit