spotless and test fixes

Signed-off-by: Danno Ferrin <danno@numisight.com>

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionDecoder.java

@@ -21,7 +21,6 @@ import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
-import java.util.Map;
 import java.util.Optional;
 
 import com.google.common.collect.ImmutableMap;

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java

@@ -73,7 +73,6 @@ import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Set;

ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/pretty-print/rjumpv.json

@@ -4,5 +4,5 @@
     "0xEF0001010004020001001304000000008000026000e20200030000fff65b5b00600160015500"
   ],
   "stdin": "",
-  "stdout": "0x # EOF\nef0001 # Magic and Version ( 1 )\n010004 # Types length ( 4 )\n020001 # Total code sections ( 1 )\n  0013 # Code section 0 , 19 bytes\n040000 # Data section length(  0 )\n    00 # Terminator (end of header)\n       # Code section 0 types\n    00 # 0 inputs \n    80 # 0 outputs  (Non-returning function)\n  0002 # max stack:  2\n       # Code section 0\n  6000 # [0] PUSH1(0)\ne20200030000fff6 # [2] RJUMPV(3,0,-10)\n    5b # [10] NOOP\n    5b # [11] NOOP\n    00 # [12] STOP\n  6001 # [13] PUSH1(1)\n  6001 # [15] PUSH1(1)\n    55 # [17] SSTORE\n    00 # [18] STOP\n       # Data section (empty)\n"
+  "stdout": "0x # EOF\nef0001 # Magic and Version ( 1 )\n010004 # Types length ( 4 )\n020001 # Total code sections ( 1 )\n  0013 # Code section 0 , 19 bytes\n040000 # Data section length(  0 )\n    00 # Terminator (end of header)\n       # Code section 0 types\n    00 # 0 inputs \n    80 # 0 outputs  (Non-returning function)\n  0002 # max stack:  2\n       # Code section 0 - in=0 out=non-returning height=2\n  6000 # [0] PUSH1(0)\ne20200030000fff6 # [2] RJUMPV(3,0,-10)\n    5b # [10] NOOP\n    5b # [11] NOOP\n    00 # [12] STOP\n  6001 # [13] PUSH1(1)\n  6001 # [15] PUSH1(1)\n    55 # [17] SSTORE\n    00 # [18] STOP\n       # Data section (empty)\n"
 }

ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/pretty-print/subcontainers.json

@@ -4,5 +4,5 @@
     "0xef000101000402000100130300010043040000000080000436600060003736600060006000ec0060005500ef0001010004020001000b03000100200400000000800003366000600037366000ee00ef0001010004020001000d0400400000800002d10000600055d1002060015500"
   ],
   "stdin": "",
-  "stdout": "0x # EOF\nef0001 # Magic and Version ( 1 )\n010004 # Types length ( 4 )\n020001 # Total code sections ( 1 )\n  0013 # Code section 0 , 19 bytes\n030001 # Total subcontainers ( 1 )\n  0043 # Sub container 0, 67 byte\n040000 # Data section length(  0 )\n    00 # Terminator (end of header)\n       # Code section 0 types\n    00 # 0 inputs \n    80 # 0 outputs  (Non-returning function)\n  0004 # max stack:  4\n       # Code section 0\n    36 # [0] CALLDATASIZE\n  6000 # [1] PUSH1(0)\n  6000 # [3] PUSH1(0)\n    37 # [5] CALLDATACOPY\n    36 # [6] CALLDATASIZE\n  6000 # [7] PUSH1(0)\n  6000 # [9] PUSH1(0)\n  6000 # [11] PUSH1(0)\n  ec00 # [13] EOFCREATE(0)\n  6000 # [15] PUSH1(0)\n    55 # [17] SSTORE\n    00 # [18] STOP\n           # Subcontainer 0 starts here\n    ef0001 # Magic and Version ( 1 )\n    010004 # Types length ( 4 )\n    020001 # Total code sections ( 1 )\n      000b # Code section 0 , 11 bytes\n    030001 # Total subcontainers ( 1 )\n      0020 # Sub container 0, 32 byte\n    040000 # Data section length(  0 )    \n        00 # Terminator (end of header)\n           # Code section 0 types\n        00 # 0 inputs \n        80 # 0 outputs  (Non-returning function)\n      0003 # max stack:  3\n           # Code section 0\n        36 # [0] CALLDATASIZE\n      6000 # [1] PUSH1(0)\n      6000 # [3] PUSH1(0)\n        37 # [5] CALLDATACOPY\n        36 # [6] CALLDATASIZE\n      6000 # [7] PUSH1(0)\n      ee00 # [9] RETURNCONTRACT(0)\n               # Subcontainer 0.0 starts here\n        ef0001 # Magic and Version ( 1 )\n        010004 # Types length ( 4 )\n        020001 # Total code sections ( 1 )\n          000d # Code section 0 , 13 bytes\n        040040 # Data section length(  64 ) (actual size 0)        \n            00 # Terminator (end of header)\n               # Code section 0 types\n            00 # 0 inputs \n            80 # 0 outputs  (Non-returning function)\n          0002 # max stack:  2\n               # Code section 0\n        d10000 # [0] DATALOADN(0x0000)\n          6000 # [3] PUSH1(0)\n            55 # [5] SSTORE\n        d10020 # [6] DATALOADN(0x0020)\n          6001 # [9] PUSH1(1)\n            55 # [11] SSTORE\n            00 # [12] STOP\n               # Data section (empty)\n               # Subcontainer 0.0 ends\n           # Data section (empty)\n           # Subcontainer 0 ends\n       # Data section (empty)\n"
+  "stdout": "0x # EOF\nef0001 # Magic and Version ( 1 )\n010004 # Types length ( 4 )\n020001 # Total code sections ( 1 )\n  0013 # Code section 0 , 19 bytes\n030001 # Total subcontainers ( 1 )\n  0043 # Sub container 0, 67 byte\n040000 # Data section length(  0 )\n    00 # Terminator (end of header)\n       # Code section 0 types\n    00 # 0 inputs \n    80 # 0 outputs  (Non-returning function)\n  0004 # max stack:  4\n       # Code section 0 - in=0 out=non-returning height=4\n    36 # [0] CALLDATASIZE\n  6000 # [1] PUSH1(0)\n  6000 # [3] PUSH1(0)\n    37 # [5] CALLDATACOPY\n    36 # [6] CALLDATASIZE\n  6000 # [7] PUSH1(0)\n  6000 # [9] PUSH1(0)\n  6000 # [11] PUSH1(0)\n  ec00 # [13] EOFCREATE(0)\n  6000 # [15] PUSH1(0)\n    55 # [17] SSTORE\n    00 # [18] STOP\n           # Subcontainer 0 starts here\n    ef0001 # Magic and Version ( 1 )\n    010004 # Types length ( 4 )\n    020001 # Total code sections ( 1 )\n      000b # Code section 0 , 11 bytes\n    030001 # Total subcontainers ( 1 )\n      0020 # Sub container 0, 32 byte\n    040000 # Data section length(  0 )    \n        00 # Terminator (end of header)\n           # Code section 0 types\n        00 # 0 inputs \n        80 # 0 outputs  (Non-returning function)\n      0003 # max stack:  3\n           # Code section 0 - in=0 out=non-returning height=3\n        36 # [0] CALLDATASIZE\n      6000 # [1] PUSH1(0)\n      6000 # [3] PUSH1(0)\n        37 # [5] CALLDATACOPY\n        36 # [6] CALLDATASIZE\n      6000 # [7] PUSH1(0)\n      ee00 # [9] RETURNCONTRACT(0)\n               # Subcontainer 0.0 starts here\n        ef0001 # Magic and Version ( 1 )\n        010004 # Types length ( 4 )\n        020001 # Total code sections ( 1 )\n          000d # Code section 0 , 13 bytes\n        040040 # Data section length(  64 ) (actual size 0)        \n            00 # Terminator (end of header)\n               # Code section 0 types\n            00 # 0 inputs \n            80 # 0 outputs  (Non-returning function)\n          0002 # max stack:  2\n               # Code section 0 - in=0 out=non-returning height=2\n        d10000 # [0] DATALOADN(0x0000)\n          6000 # [3] PUSH1(0)\n            55 # [5] SSTORE\n        d10020 # [6] DATALOADN(0x0020)\n          6001 # [9] PUSH1(1)\n            55 # [11] SSTORE\n            00 # [12] STOP\n               # Data section (empty)\n               # Subcontainer 0.0 ends\n           # Data section (empty)\n           # Subcontainer 0 ends\n       # Data section (empty)\n"
 }

ethereum/referencetests/build.gradle

@@ -272,7 +272,6 @@ def generateTestFiles(FileTree jsonPath, File templateFile, String pathstrip, St
       paths << pathFile.substring(pathFile.indexOf(pathstrip))
     }
   }
-  println paths.collate(5)
 
   paths.collate(5).eachWithIndex { tests, idx ->
     def testFile = file(destination + "/" + namePrefix + "_" + idx + ".java")