From 66e08c9743150d0e9be22f5fabb272e45c604c8c Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Fri, 4 Aug 2017 19:19:45 +0200 Subject: Fix some formatting issues in VMTest fillers --- .../vmEnvironmentalInfoTestFiller.json | 64 +++++++++++----------- src/VMTestsFiller/vmSha3TestFiller.json | 36 ++++++------ 2 files changed, 50 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json b/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json index af413fa0c..86a49549d 100644 --- a/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json +++ b/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json @@ -489,7 +489,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x256", + "data" : "0x2560", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -593,7 +593,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x123456789abcdef0000000000000000000000000000000000000000000000000024", + "data" : "0x123456789abcdef00000000000000000000000000000000000000000000000000024", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -627,7 +627,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x123456789abcdef0000000000000000000000000000000000000000000000000024", + "data" : "0x123456789abcdef00000000000000000000000000000000000000000000000000024", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -697,7 +697,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x256", + "data" : "0x2560", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -802,7 +802,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -836,7 +836,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -870,7 +870,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -904,7 +904,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -938,7 +938,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -973,7 +973,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1007,7 +1007,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1042,7 +1042,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1077,7 +1077,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1111,7 +1111,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1145,7 +1145,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1180,7 +1180,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1214,7 +1214,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1249,7 +1249,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1284,7 +1284,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1318,7 +1318,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1353,7 +1353,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1387,7 +1387,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1422,7 +1422,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "123456789", "gas" : "100000000000" } @@ -1537,7 +1537,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "123456789", "gas" : "100000000000" } @@ -1571,7 +1571,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "123456789", "gas" : "100000000000" } @@ -1616,7 +1616,7 @@ "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "123456789", "gas" : "100000000000" } @@ -1650,7 +1650,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "1000000000", "gas" : "100000000000" } @@ -1694,7 +1694,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "123456789", "gas" : "100000000000" } @@ -1741,7 +1741,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "123456789", "gas" : "100000000000" } @@ -1786,7 +1786,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "123456789", "gas" : "100000000000" } @@ -1830,7 +1830,7 @@ "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", "value" : "1000000000000000000", - "data" : "0x1234567890abcdef01234567890abcdef", + "data" : "0x1234567890abcdef01234567890abcdef0", "gasPrice" : "123456789", "gas" : "100000000000" } @@ -1849,7 +1849,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "10000000000000033000", "nonce" : "88", - "code" : "(asm PC ADDRESS BALANCE CALLER ORIGIN CALLVALUE CALLDATASIZE GASPRICE 1 NUMBER SUB BLOCKHASH COINBASE TIMESTAMP NUMBER DIFFICULTY GASLIMIT PC CALLDATASIZE 0 CALLDATALOAD 38 CALLDATALOAD 19 CALLDATALOAD CODESIZE 0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff 0 MSTORE 32 0 0 CREATE 32 0 32 0 0 ADDRESS 3000 CALL 0 MLOAD 4096 MSTORE MSIZE 32 MUL 0 SHA3 ADDRESS SELFDESTRUCT 1 2 RETURN)", + "code" : "(asm PC ADDRESS BALANCE CALLER ORIGIN CALLVALUE CALLDATASIZE GASPRICE 1 NUMBER SUB BLOCKHASH COINBASE TIMESTAMP NUMBER DIFFICULTY GASLIMIT PC CALLDATASIZE 0 CALLDATALOAD 38 CALLDATALOAD 19 CALLDATALOAD CODESIZE 0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff 0 MSTORE 32 0 0 CREATE 32 0 32 0 0 ADDRESS 3000 CALL 0 MLOAD 4096 MSTORE MSIZE 32 MUL 0 KECCAK256 ADDRESS SELFDESTRUCT 1 2 RETURN)", "storage": {} } }, diff --git a/src/VMTestsFiller/vmSha3TestFiller.json b/src/VMTestsFiller/vmSha3TestFiller.json index e738975d8..943a3f281 100644 --- a/src/VMTestsFiller/vmSha3TestFiller.json +++ b/src/VMTestsFiller/vmSha3TestFiller.json @@ -19,7 +19,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 0 0)}", + "code" : "{ [[ 0 ]] (KECCAK256 0 0)}", "storage": {} } }, @@ -54,7 +54,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 4 5)}", + "code" : "{ [[ 0 ]] (KECCAK256 4 5)}", "storage": {} } }, @@ -89,7 +89,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 10 10)}", + "code" : "{ [[ 0 ]] (KECCAK256 10 10)}", "storage": {} } }, @@ -117,7 +117,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 1000 0xfffff)}", + "code" : "{ [[ 0 ]] (KECCAK256 1000 0xfffff)}", "storage": {} } }, @@ -145,7 +145,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 0xfffffffff 100)}", + "code" : "{ [[ 0 ]] (KECCAK256 0xfffffffff 100)}", "storage": {} } }, @@ -173,7 +173,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 10000 0xfffffffff )}", + "code" : "{ [[ 0 ]] (KECCAK256 10000 0xfffffffff )}", "storage": {} } }, @@ -201,7 +201,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}", + "code" : "{ [[ 0 ]] (KECCAK256 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}", "storage": {} } }, @@ -229,7 +229,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}", + "code" : "{ [[ 0 ]] (KECCAK256 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}", "storage": {} } }, @@ -257,7 +257,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 2)}", + "code" : "{ [[ 0 ]] (KECCAK256 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 2)}", "storage": {} } }, @@ -292,7 +292,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 0x1000000 2)}", + "code" : "{ [[ 0 ]] (KECCAK256 0x1000000 2)}", "storage": {} } }, @@ -327,7 +327,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 960 1)}", + "code" : "{ [[ 0 ]] (KECCAK256 960 1)}", "storage": {} } }, @@ -362,7 +362,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 992 1)}", + "code" : "{ [[ 0 ]] (KECCAK256 992 1)}", "storage": {} } }, @@ -397,7 +397,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 1024 0)}", + "code" : "{ [[ 0 ]] (KECCAK256 1024 0)}", "storage": {} } }, @@ -432,7 +432,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 1024 1)}", + "code" : "{ [[ 0 ]] (KECCAK256 1024 1)}", "storage": {} } }, @@ -467,7 +467,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 1984 1)}", + "code" : "{ [[ 0 ]] (KECCAK256 1984 1)}", "storage": {} } }, @@ -502,7 +502,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 2016 1)}", + "code" : "{ [[ 0 ]] (KECCAK256 2016 1)}", "storage": {} } }, @@ -537,7 +537,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 2016 32)}", + "code" : "{ [[ 0 ]] (KECCAK256 2016 32)}", "storage": {} } }, @@ -572,7 +572,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "nonce" : "0", - "code" : "{ [[ 0 ]] (SHA3 2048 1)}", + "code" : "{ [[ 0 ]] (KECCAK256 2048 1)}", "storage": {} } }, -- cgit v1.2.3