From 3b90fbfaf0b6180be9276bbd050ac2475b95d949 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Wed, 19 Apr 2017 13:28:03 +0300 Subject: replace SUICIDE with SELFDESTRUCT --- src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json | 2 +- src/VMTestsFiller/vmSystemOperationsTestFiller.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/VMTestsFiller') diff --git a/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json b/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json index f0b8b3838..af413fa0c 100644 --- a/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json +++ b/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json @@ -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 SUICIDE 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 SHA3 ADDRESS SELFDESTRUCT 1 2 RETURN)", "storage": {} } }, diff --git a/src/VMTestsFiller/vmSystemOperationsTestFiller.json b/src/VMTestsFiller/vmSystemOperationsTestFiller.json index e1c3c49fe..0b91e22cc 100644 --- a/src/VMTestsFiller/vmSystemOperationsTestFiller.json +++ b/src/VMTestsFiller/vmSystemOperationsTestFiller.json @@ -784,7 +784,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE (CALLER))}", + "code" : "{ (SELFDESTRUCT (CALLER))}", "storage": {} }, "cd1722f3947def4cf144679da39c4c32bdc35681" : { @@ -825,7 +825,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", + "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}", "storage": {} }, "cd1722f3947def4cf144679da39c4c32bdc35681" : { @@ -866,7 +866,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ (SUICIDE (ADDRESS) )}", + "code" : "{ (SELFDESTRUCT (ADDRESS) )}", "storage": {} }, "cd1722f3947def4cf144679da39c4c32bdc35681" : { @@ -1345,7 +1345,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "100000000000000000000000", "nonce" : "0", - "code" : "{ [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", + "code" : "{ [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5) }", "storage": {} }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { @@ -1396,7 +1396,7 @@ }, "945304eb96065b2a98b57a48a06ae28d285a71b5" : { "balance" : "23", - "code" : "{ [[ (PC) ]] (ADD 1 (CALL 500 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", + "code" : "{ [[ (PC) ]] (ADD 1 (CALL 500 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ", "nonce" : "0", "storage" : { } -- cgit