Merge pull request #841 from tronprotocol/develop-evan-rmchineses

Develop evan rmchineses

Author: huzhenyuan

src/test/java/org/tron/core/actuator/AssetIssueActuatorTest.java

@@ -7,7 +7,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -31,7 +30,6 @@
 import org.tron.core.exception.ContractValidateException;
 import org.tron.protos.Contract;
 import org.tron.protos.Contract.AssetIssueContract.FrozenSupply;
-import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.AccountType;
 import org.tron.protos.Protocol.Transaction.Result.code;
 
@@ -565,7 +563,7 @@ public void assetNameTest() {
     //Contain chinese character, throw exception.
     contract = Any.pack(Contract.AssetIssueContract.newBuilder()
         .setOwnerAddress(ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)))
-        .setName(ByteString.copyFrom("测试".getBytes()))
+        .setName(ByteString.copyFrom(ByteArray.fromHexString("E6B58BE8AF95")))
         .setTotalSupply(TOTAL_SUPPLY)
         .setTrxNum(TRX_NUM).setNum(NUM)
         .setStartTime(nowTime)

src/test/java/org/tron/core/actuator/ParticipateAssetIssueActuatorTest.java

@@ -583,8 +583,9 @@ public void assetNameTest() {
     }
 
     //Contain chinese character, throw exception.
-    assetName = "测试";
-    actuator = new ParticipateAssetIssueActuator(getContract(1000L, assetName), dbManager);
+    actuator = new ParticipateAssetIssueActuator(
+        getContract(1000L, ByteString.copyFrom(ByteArray.fromHexString("E6B58BE8AF95"))),
+        dbManager);
     ret = new TransactionResultCapsule();
     try {
       actuator.validate();
@@ -824,39 +825,39 @@ public void multiplyOverflowTest() {
   }
 
   /**
-   *  exchangeAmount <= 0 trx, throw exception
+   * exchangeAmount <= 0 trx, throw exception
    */
   @Test
   public void exchangeAmountTest() {
 
     dbManager.getDynamicPropertiesStore().saveLatestBlockHeaderTimestamp(1000000);
     AssetIssueContract assetIssueContract =
-            AssetIssueContract.newBuilder()
-                    .setOwnerAddress(ByteString.copyFrom(ByteArray.fromHexString(TO_ADDRESS)))
-                    .setName(ByteString.copyFrom(ByteArray.fromString(ASSET_NAME)))
-                    .setTotalSupply(TOTAL_SUPPLY)
-                    .setTrxNum(100)
-                    .setNum(1)
-                    .setStartTime(dbManager.getHeadBlockTimeStamp() - 10000)
-                    .setEndTime(dbManager.getHeadBlockTimeStamp() + 11000000)
-                    .setVoteScore(VOTE_SCORE)
-                    .setDescription(ByteString.copyFrom(ByteArray.fromString(DESCRIPTION)))
-                    .setUrl(ByteString.copyFrom(ByteArray.fromString(URL)))
-                    .build();
+        AssetIssueContract.newBuilder()
+            .setOwnerAddress(ByteString.copyFrom(ByteArray.fromHexString(TO_ADDRESS)))
+            .setName(ByteString.copyFrom(ByteArray.fromString(ASSET_NAME)))
+            .setTotalSupply(TOTAL_SUPPLY)
+            .setTrxNum(100)
+            .setNum(1)
+            .setStartTime(dbManager.getHeadBlockTimeStamp() - 10000)
+            .setEndTime(dbManager.getHeadBlockTimeStamp() + 11000000)
+            .setVoteScore(VOTE_SCORE)
+            .setDescription(ByteString.copyFrom(ByteArray.fromString(DESCRIPTION)))
+            .setUrl(ByteString.copyFrom(ByteArray.fromString(URL)))
+            .build();
     AssetIssueCapsule assetIssueCapsule = new AssetIssueCapsule(assetIssueContract);
     dbManager.getAssetIssueStore()
-            .put(assetIssueCapsule.getName().toByteArray(), assetIssueCapsule);
+        .put(assetIssueCapsule.getName().toByteArray(), assetIssueCapsule);
 
     AccountCapsule toAccountCapsule = dbManager.getAccountStore()
-            .get(ByteArray.fromHexString(TO_ADDRESS));
+        .get(ByteArray.fromHexString(TO_ADDRESS));
     toAccountCapsule.addAsset(ASSET_NAME, TOTAL_SUPPLY);
     dbManager.getAccountStore().put(toAccountCapsule.getAddress().toByteArray(), toAccountCapsule);
     AccountCapsule owner = dbManager.getAccountStore().get(ByteArray.fromHexString(OWNER_ADDRESS));
     owner.setBalance(100000000000000L);
     dbManager.getAccountStore().put(owner.getAddress().toByteArray(), owner);
 
     ParticipateAssetIssueActuator actuator = new ParticipateAssetIssueActuator(getContract(1),
-            dbManager);
+        dbManager);
 
     TransactionResultCapsule ret = new TransactionResultCapsule();
     try {

src/test/java/org/tron/core/actuator/TransferAssetActuatorTest.java

@@ -618,8 +618,7 @@ public void assetNameTest() {
     }
 
     //Contain chinese character, throw exception.
-    assetName = "测试";
-    actuator = new TransferAssetActuator(getContract(100L, assetName), dbManager);
+    actuator = new TransferAssetActuator(getContract(100L, ByteString.copyFrom(ByteArray.fromHexString("E6B58BE8AF95"))), dbManager);
     try {
       actuator.validate();
       actuator.execute(ret);

src/test/java/org/tron/core/actuator/UpdateAccountActuatorTest.java

@@ -326,7 +326,8 @@ public void invalidName() {
     //Can't contain chinese characters
     try {
       UpdateAccountActuator actuator = new UpdateAccountActuator(
-          getContract("测试", OWNER_ADDRESS), dbManager);
+          getContract(ByteString.copyFrom(ByteArray.fromHexString("E6B58BE8AF95"))
+              , OWNER_ADDRESS), dbManager);
       actuator.validate();
       actuator.execute(ret);
       Assert.assertFalse(true);