From 96ec2d3b620461d7ac8670bd37bf225f3453e306 Mon Sep 17 00:00:00 2001 From: Karim TAAM Date: Tue, 12 May 2020 18:39:53 +0200 Subject: [PATCH] fix filler format --- .../shouldErrorWhenReturnStackGrowsAbove1023Filler.json | 4 ++-- .../shouldSucceedWhenReturnStackGrowsUntil1023Filler.json | 4 ++-- .../stSubroutine/simpleSubroutineFiller.json | 4 ++-- .../stSubroutine/subroutineAtEndOfCodeFiller.json | 4 ++-- .../stSubroutine/subroutineInvalidJumpFiller.json | 4 ++-- .../stSubroutine/subroutineShallowReturnStackFiller.json | 4 ++-- .../stSubroutine/twoLevelsSubroutinesFiller.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/GeneralStateTestsFiller/stSubroutine/shouldErrorWhenReturnStackGrowsAbove1023Filler.json b/src/GeneralStateTestsFiller/stSubroutine/shouldErrorWhenReturnStackGrowsAbove1023Filler.json index 9125cc564ca..fc07d2c03f3 100644 --- a/src/GeneralStateTestsFiller/stSubroutine/shouldErrorWhenReturnStackGrowsAbove1023Filler.json +++ b/src/GeneralStateTestsFiller/stSubroutine/shouldErrorWhenReturnStackGrowsAbove1023Filler.json @@ -28,8 +28,8 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "//code" : "This should failed because return stack grows above 1023" - "//codeLLL" : "(asm 0x0401 0x00 SSTORE BEGINSUB 0x01 0x00 SLOAD SUB DUP1 ISZERO 0x18 JUMPI 0x00 SSTORE 0x06 JUMPSUB JUMPDEST)" + "//code" : "This should failed because return stack grows above 1023", + "//codeLLL" : "(asm 0x0401 0x00 SSTORE BEGINSUB 0x01 0x00 SLOAD SUB DUP1 ISZERO 0x18 JUMPI 0x00 SSTORE 0x06 JUMPSUB JUMPDEST)", "code" : "0x610401600055b260016000540380156018576000556006b35b", "nonce" : "0", "storage": { diff --git a/src/GeneralStateTestsFiller/stSubroutine/shouldSucceedWhenReturnStackGrowsUntil1023Filler.json b/src/GeneralStateTestsFiller/stSubroutine/shouldSucceedWhenReturnStackGrowsUntil1023Filler.json index 0a0372f0bd4..d18f6be9ff6 100644 --- a/src/GeneralStateTestsFiller/stSubroutine/shouldSucceedWhenReturnStackGrowsUntil1023Filler.json +++ b/src/GeneralStateTestsFiller/stSubroutine/shouldSucceedWhenReturnStackGrowsUntil1023Filler.json @@ -28,8 +28,8 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "//code" : "This should succeed because return stack grows until 1023" - "//codeLLL" : "(asm 0x0400 0x00 SSTORE BEGINSUB 0x01 0x00 SLOAD SUB DUP1 ISZERO 0x18 JUMPI 0x00 SSTORE 0x06 JUMPSUB JUMPDEST)" + "//code" : "This should succeed because return stack grows until 1023", + "//codeLLL" : "(asm 0x0400 0x00 SSTORE BEGINSUB 0x01 0x00 SLOAD SUB DUP1 ISZERO 0x18 JUMPI 0x00 SSTORE 0x06 JUMPSUB JUMPDEST)", "code" : "0x610400600055b260016000540380156018576000556006b35b", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSubroutine/simpleSubroutineFiller.json b/src/GeneralStateTestsFiller/stSubroutine/simpleSubroutineFiller.json index c6ed3bfacb5..dcaf5b81238 100644 --- a/src/GeneralStateTestsFiller/stSubroutine/simpleSubroutineFiller.json +++ b/src/GeneralStateTestsFiller/stSubroutine/simpleSubroutineFiller.json @@ -27,8 +27,8 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "//code" : "This should jump into a subroutine, back out and stop." - "//codeLLL" : "(asm 0x04 JUMPSUB STOP BEGINSUB RETURNSUB)" + "//code" : "This should jump into a subroutine, back out and stop.", + "//codeLLL" : "(asm 0x04 JUMPSUB STOP BEGINSUB RETURNSUB)", "code" : "0x6004b300b2b7", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSubroutine/subroutineAtEndOfCodeFiller.json b/src/GeneralStateTestsFiller/stSubroutine/subroutineAtEndOfCodeFiller.json index 43ae3c36aab..663e25811f5 100644 --- a/src/GeneralStateTestsFiller/stSubroutine/subroutineAtEndOfCodeFiller.json +++ b/src/GeneralStateTestsFiller/stSubroutine/subroutineAtEndOfCodeFiller.json @@ -27,8 +27,8 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "//code" : "When the subroutine returns, it should hit the ‘virtual stop’ after the bytecode, and not exit with error" - "//codeLLL" : "(asm 0x05 JUMP BEGINSUB RETURNSUB JUMPDEST 0x03 JUMPSUB)" + "//code" : "When the subroutine returns, it should hit the ‘virtual stop’ after the bytecode, and not exit with error", + "//codeLLL" : "(asm 0x05 JUMP BEGINSUB RETURNSUB JUMPDEST 0x03 JUMPSUB)", "code" : "0x600556b2b75b6003b3", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSubroutine/subroutineInvalidJumpFiller.json b/src/GeneralStateTestsFiller/stSubroutine/subroutineInvalidJumpFiller.json index f2136e2c055..d8fe7bdb575 100644 --- a/src/GeneralStateTestsFiller/stSubroutine/subroutineInvalidJumpFiller.json +++ b/src/GeneralStateTestsFiller/stSubroutine/subroutineInvalidJumpFiller.json @@ -27,8 +27,8 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "//code" : "This should fail, since the given location is outside of the code-range." - "//codeLLL" : "(asm 0x01000000000000000c JUMPSUB STOP BEGINSUB 0x11 JUMPSUB RETURNSUB BEGINSUB RETURNSUB)" + "//code" : "This should fail, since the given location is outside of the code-range.", + "//codeLLL" : "(asm 0x01000000000000000c JUMPSUB STOP BEGINSUB 0x11 JUMPSUB RETURNSUB BEGINSUB RETURNSUB)", "code" : "0x6801000000000000000cb300b26011b3b7b2b7", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSubroutine/subroutineShallowReturnStackFiller.json b/src/GeneralStateTestsFiller/stSubroutine/subroutineShallowReturnStackFiller.json index d060c3f273c..98bd77462fc 100644 --- a/src/GeneralStateTestsFiller/stSubroutine/subroutineShallowReturnStackFiller.json +++ b/src/GeneralStateTestsFiller/stSubroutine/subroutineShallowReturnStackFiller.json @@ -27,8 +27,8 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "//code" : "This should fail at first opcode, due to shallow return_stack" - "//codeLLL" : "(asm RETURNSUB PC PC)" + "//code" : "This should fail at first opcode, due to shallow return_stack", + "//codeLLL" : "(asm RETURNSUB PC PC)", "code" : "0xb75858", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stSubroutine/twoLevelsSubroutinesFiller.json b/src/GeneralStateTestsFiller/stSubroutine/twoLevelsSubroutinesFiller.json index 0c872619353..c0d3754804d 100644 --- a/src/GeneralStateTestsFiller/stSubroutine/twoLevelsSubroutinesFiller.json +++ b/src/GeneralStateTestsFiller/stSubroutine/twoLevelsSubroutinesFiller.json @@ -27,8 +27,8 @@ "pre" : { "1000000000000000000000000000000000000000" : { "balance" : "1000000000000000000", - "//code" : "This should execute fine, going into one two depths of subroutines Bytecode" - "//codeLLL" : "(asm 0x00000000000000000c JUMPSUB STOP BEGINSUB 0x11 JUMPSUB RETURNSUB BEGINSUB RETURNSUB)" + "//code" : "This should execute fine, going into one two depths of subroutines Bytecode", + "//codeLLL" : "(asm 0x00000000000000000c JUMPSUB STOP BEGINSUB 0x11 JUMPSUB RETURNSUB BEGINSUB RETURNSUB)", "code" : "0x6800000000000000000cb300b26011b3b7b2b7", "nonce" : "0", "storage" : {