Merge remote-tracking branch 'origin/develop' into develop

Author: zhaohong

src/main/java/org/tron/core/actuator/WitnessCreateActuator.java

@@ -33,7 +33,11 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
           .unpack(WitnessCreateContract.class);
       this.createWitness(witnessCreateContract);
       ret.setStatus(fee, code.SUCESS);
-    } catch (final InvalidProtocolBufferException e) {
+    } catch (InvalidProtocolBufferException e) {
+      logger.debug(e.getMessage(), e);
+      ret.setStatus(fee, code.FAILED);
+      throw new ContractExeException(e.getMessage());
+    } catch (BalanceInsufficientException e) {
       logger.debug(e.getMessage(), e);
       ret.setStatus(fee, code.FAILED);
       throw new ContractExeException(e.getMessage());
@@ -93,7 +97,7 @@ public long calcFee() {
     return 0;
   }
 
-  private void createWitness(final WitnessCreateContract witnessCreateContract) {
+  private void createWitness(final WitnessCreateContract witnessCreateContract) throws BalanceInsufficientException {
     //Create Witness by witnessCreateContract
     final WitnessCapsule witnessCapsule = new WitnessCapsule(
         witnessCreateContract.getOwnerAddress(),
@@ -106,16 +110,10 @@ private void createWitness(final WitnessCreateContract witnessCreateContract) {
         .get(witnessCapsule.createDbKey());
     accountCapsule.setIsWitness(true);
     this.dbManager.getAccountStore().put(accountCapsule.createDbKey(), accountCapsule);
+    dbManager.adjustBalance(witnessCreateContract.getOwnerAddress().toByteArray(),
+            -dbManager.getDynamicPropertiesStore().getAccountUpgradeCost());
 
-    try {
-      dbManager.adjustBalance(witnessCreateContract.getOwnerAddress().toByteArray(),
-          -dbManager.getDynamicPropertiesStore().getAccountUpgradeCost());
-
-      dbManager.adjustBalance(this.dbManager.getAccountStore().getBlackhole().createDbKey(),
-          +dbManager.getDynamicPropertiesStore().getAccountUpgradeCost());
-
-    } catch (BalanceInsufficientException e) {
-      throw new RuntimeException(e);
-    }
+    dbManager.adjustBalance(this.dbManager.getAccountStore().getBlackhole().createDbKey(),
+            +dbManager.getDynamicPropertiesStore().getAccountUpgradeCost());
   }
 }

src/main/java/org/tron/core/actuator/WitnessUpdateActuator.java

@@ -59,12 +59,16 @@ public boolean validate() throws ContractValidateException {
         throw new ContractValidateException("Invalidate address");
       }
 
+      if (!dbManager.getAccountStore().has(contract.getOwnerAddress().toByteArray())) {
+        throw new ContractValidateException("account does not exist");
+      }
+
       if (!TransactionUtil.validUrl(contract.getUpdateUrl().toByteArray())) {
         throw new ContractValidateException("Invalidate url");
       }
 
       if (this.dbManager.getWitnessStore().get(contract.getOwnerAddress().toByteArray()) == null) {
-        throw new ContractValidateException("Witness not existed");
+        throw new ContractValidateException("Witness does not exist");
       }
     } catch (final Exception ex) {
       ex.printStackTrace();

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

@@ -16,6 +16,7 @@
 import org.tron.common.utils.FileUtil;
 import org.tron.core.Constant;
 import org.tron.core.Wallet;
+import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
 import org.tron.core.capsule.WitnessCapsule;
 import org.tron.core.config.DefaultConfig;
@@ -24,6 +25,7 @@
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.protos.Contract;
+import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.Transaction.Result.code;
 
 @Slf4j
@@ -33,7 +35,10 @@ public class WitnessUpdateActuatorTest {
   private static Manager dbManager;
   private static final String dbPath = "output_WitnessUpdate_test";
   private static final String OWNER_ADDRESS;
-  private static final String OWNER_ADDRESS_NOTEXIT;
+  private static final String OWNER_ADDRESS_ACCOUNT_NAME = "test_account";
+  private static final String OWNER_ADDRESS_NOT_WITNESS;
+  private static final String OWNER_ADDRESS_NOT_WITNESS_ACCOUNT_NAME = "test_account1";
+  private static final String OWNER_ADDRESS_NOTEXIST;
   private static final String URL = "https://tron.network";
   private static final String NewURL = "https://tron.org";
   private static final String OWNER_ADDRESS_INVALIATE = "aaaa";
@@ -42,8 +47,10 @@ public class WitnessUpdateActuatorTest {
     Args.setParam(new String[]{"--output-directory", dbPath}, Constant.TEST_CONF);
     context = new AnnotationConfigApplicationContext(DefaultConfig.class);
     OWNER_ADDRESS = Wallet.getAddressPreFixString() + "abd4b9367799eaa3197fecb144eb71de1e049abc";
-    OWNER_ADDRESS_NOTEXIT =
+    OWNER_ADDRESS_NOTEXIST =
         Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d4271a1abc";
+    OWNER_ADDRESS_NOT_WITNESS =
+        Wallet.getAddressPreFixString() + "548794500882809695a8a687866e76d427122222";
   }
 
   /**
@@ -59,11 +66,28 @@ public static void init() {
    */
   @Before
   public void createCapsule() {
+    // address in accountStore and witnessStore
+    AccountCapsule accountCapsule =
+            new AccountCapsule(
+                    ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)),
+                    ByteString.copyFromUtf8(OWNER_ADDRESS_ACCOUNT_NAME),
+                    Protocol.AccountType.Normal);
+    dbManager.getAccountStore().put(ByteArray.fromHexString(OWNER_ADDRESS), accountCapsule);
     WitnessCapsule ownerCapsule = new WitnessCapsule(
         ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)), 10_000_000L, URL);
-
     dbManager.getWitnessStore().put(ByteArray.fromHexString(OWNER_ADDRESS), ownerCapsule);
-    dbManager.getWitnessStore().delete(ByteArray.fromHexString(OWNER_ADDRESS_NOTEXIT));
+
+    // address exist in accountStore, but is not witness
+    AccountCapsule accountNotWitnessCapsule =
+            new AccountCapsule(
+                    ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS_NOT_WITNESS)),
+                    ByteString.copyFromUtf8(OWNER_ADDRESS_NOT_WITNESS_ACCOUNT_NAME),
+                    Protocol.AccountType.Normal);
+    dbManager.getAccountStore().put(ByteArray.fromHexString(OWNER_ADDRESS_NOT_WITNESS), accountNotWitnessCapsule);
+    dbManager.getWitnessStore().delete(ByteArray.fromHexString(OWNER_ADDRESS_NOT_WITNESS));
+
+    // address does not exist in accountStore
+    dbManager.getAccountStore().delete(ByteArray.fromHexString(OWNER_ADDRESS_NOTEXIST));
   }
 
   private Any getContract(String address, String url) {
@@ -197,21 +221,41 @@ public void invalidateUrlTest() {
   }
 
   /**
-   * use AccountStore not exists Address createWitness,result is failed,exception is "account not
-   * exists".
+   * use AccountStore not exists Address createWitness,result is failed,exception is
+   * "Witness does not exist"
+   */
+  @Test
+  public void notExistWitness() {
+    WitnessUpdateActuator actuator = new WitnessUpdateActuator(
+        getContract(OWNER_ADDRESS_NOT_WITNESS, URL), dbManager);
+    TransactionResultCapsule ret = new TransactionResultCapsule();
+    try {
+      actuator.validate();
+      actuator.execute(ret);
+      fail("witness [+OWNER_ADDRESS_NOACCOUNT+] not exists");
+    } catch (ContractValidateException e) {
+      Assert.assertTrue(e instanceof ContractValidateException);
+      Assert.assertEquals("Witness does not exist", e.getMessage());
+    } catch (ContractExeException e) {
+      Assert.assertFalse(e instanceof ContractExeException);
+    }
+  }
+
+  /**
+   * if account does not exist in accountStore, the test will throw a Exception
    */
   @Test
-  public void notExitWitness() {
+  public void notExistAccount() {
     WitnessUpdateActuator actuator = new WitnessUpdateActuator(
-        getContract(OWNER_ADDRESS_NOTEXIT, URL), dbManager);
+            getContract(OWNER_ADDRESS_NOTEXIST, URL), dbManager);
     TransactionResultCapsule ret = new TransactionResultCapsule();
     try {
       actuator.validate();
       actuator.execute(ret);
-      fail("account[+OWNER_ADDRESS_NOACCOUNT+] not exists");
+      fail("account does not exist");
     } catch (ContractValidateException e) {
       Assert.assertTrue(e instanceof ContractValidateException);
-      Assert.assertEquals("Witness not existed", e.getMessage());
+      Assert.assertEquals("account does not exist", e.getMessage());
     } catch (ContractExeException e) {
       Assert.assertFalse(e instanceof ContractExeException);
     }