refactor

BlueHoopor · BlueHoopor · commit 7aaac97c81ef · 2019-03-22T12:33:17.000+08:00
diff --git a/src/main/java/org/tron/common/runtime/vm/OpCode.java b/src/main/java/org/tron/common/runtime/vm/OpCode.java
@@ -616,6 +616,11 @@ public enum OpCode {
      */
     DELEGATECALL(0xf4, 6, 1, OpCode.Tier.SpecialTier, CallFlags.Call, CallFlags.Stateless, CallFlags.Delegate),
 
+    /**
+     * (0xf5) Skinny CREATE2, same as CREATE but with deterministic address
+     */
+    CREATE2(0xf5, 4, 1, OpCode.Tier.SpecialTier),
+
     /**
      *  opcode that can be used to call another contract (or itself) while disallowing any
      *  modifications to the state during the call (and its subcalls, if present).
@@ -624,8 +629,6 @@ public enum OpCode {
      */
     STATICCALL(0xfa, 6, 1, OpCode.Tier.SpecialTier, CallFlags.Call, CallFlags.Static),
 
-    CREATE2(0xf5, 4, 1, OpCode.Tier.SpecialTier),
-
     /**
      * (0xfd) The `REVERT` instruction will stop execution, roll back all state changes done so far
      * and provide a pointer to a memory section, which can be interpreted as an error code or message.
diff --git a/src/main/java/org/tron/core/Wallet.java b/src/main/java/org/tron/core/Wallet.java
@@ -288,11 +288,6 @@ public static byte[] generateContractAddress2(byte[] address, byte[] code, byte[
     return Hash.sha3omit12(mergedData);
   }
 
-  // for test
-  public static byte[] generateContractAddress2(byte[] address, byte[] code, long salt) {
-    return generateContractAddress2(address, code, new DataWord(salt).getData());
-  }
-
   // for `CREATE`
   public static byte[] generateContractAddress(byte[] transactionRootId, long nonce) {
     byte[] nonceBytes = Longs.toByteArray(nonce);
diff --git a/src/test/java/org/tron/common/runtime/vm/Create2Test.java b/src/test/java/org/tron/common/runtime/vm/Create2Test.java
@@ -17,6 +17,7 @@
 import org.tron.core.exception.VMIllegalException;
 import org.tron.protos.Protocol.Transaction;
 import stest.tron.wallet.common.client.utils.AbiUtil;
+import stest.tron.wallet.common.client.utils.DataWord;
 
 @Slf4j
 public class Create2Test extends VMTestBase {
@@ -91,7 +92,6 @@ public void testCreate2()
 
 
     // Trigger contract method: deploy(bytes,uint)
-    long salt = 100L;
     String hexInput = AbiUtil.parseMethod(methodSign, Arrays.asList(testCode, salt));
     TVMTestResult result =  TVMTestUtils
         .triggerContractAndReturnTVMTestResult(Hex.decode(OWNER_ADDRESS),
@@ -100,7 +100,7 @@ public void testCreate2()
 
     byte[] returnValue = result.getRuntime().getResult().getHReturn();
     byte[] actualContract = MUtil.convertToTronAddress(Arrays.copyOfRange(returnValue, 12, 32));
-    byte[] expectedContract = Wallet.generateContractAddress2(address, Hex.decode(testCode), salt);
+    byte[] expectedContract = Wallet.generateContractAddress2(address, Hex.decode(testCode), new DataWord(100L).getData());
     // check deployed contract
     Assert.assertEquals(actualContract, expectedContract);
 
