Merge pull request tronprotocol#2319 from tronprotocol/HotFix/AddUnitTest

Hot fix/add unit test

Author: HuangZhengSi

src/main/java/org/tron/core/capsule/TransactionCapsule.java

@@ -925,7 +925,6 @@ public void setResult(Runtime runtime) {
       return;
     }
     this.setResultCode(contractResult.UNKNOWN);
-    return;
   }
 
   public void setResultCode(contractResult code) {

src/main/java/org/tron/core/capsule/TransactionRetCapsule.java

@@ -40,6 +40,9 @@ public void addTransactionInfo(TransactionInfo result) {
 
   @Override
   public byte[] getData() {
+    if (Objects.isNull(transactionRet)) {
+      return null;
+    }
     return transactionRet.toByteArray();
   }
 

src/main/java/org/tron/core/config/args/Args.java

@@ -135,11 +135,11 @@ public class Args {
   private String storageDbEngine = "";
 
   @Parameter(names = {
-      "--storage-db-synchronous"}, description = "Storage db is synchronous or not.(true or flase)")
+      "--storage-db-synchronous"}, description = "Storage db is synchronous or not.(true or false)")
   private String storageDbSynchronous = "";
 
   @Parameter(names = {
-      "--contract-parse-enable"}, description = "enable contract parses in java-tron or not.(true or flase)")
+      "--contract-parse-enable"}, description = "enable contract parses in java-tron or not.(true or false)")
   private String contractParseEnable = "";
 
   @Parameter(names = {"--storage-index-directory"}, description = "Storage index directory")

src/main/java/org/tron/core/db/Manager.java

@@ -1389,7 +1389,10 @@ public synchronized BlockCapsule generateBlock(
         tmpSeesion.merge();
         // push into block
         blockCapsule.addTransaction(trx);
-        transationRetCapsule.addTransactionInfo(result);
+
+        if (Objects.nonNull(result)) {
+          transationRetCapsule.addTransactionInfo(result);
+        }
         if (fromPending) {
           iterator.remove();
         }

src/main/java/org/tron/core/db/TransactionRetStore.java

@@ -39,10 +39,15 @@ public TransactionInfoCapsule getTransactionInfo(byte[] key) throws BadItemExcep
       return null;
     }
     byte[] value = revokingDB.getUnchecked(ByteArray.fromLong(blockNumber));
+    if (Objects.isNull(value)) {
+      return null;
+    }
+
     TransactionRetCapsule result = new TransactionRetCapsule(value);
     if (Objects.isNull(result) || Objects.isNull(result.getInstance())) {
       return null;
     }
+
     for (TransactionInfo transactionResultInfo : result.getInstance().getTransactioninfoList()) {
       if (transactionResultInfo.getId().equals(ByteString.copyFrom(key))) {
         return new TransactionInfoCapsule(transactionResultInfo);

src/test/java/org/tron/core/db/TransactionRetStoreTest.java

@@ -73,4 +73,19 @@ public void get() throws BadItemException {
     TransactionInfoCapsule resultCapsule = transactionRetStore.getTransactionInfo(transactionId);
     Assert.assertNotNull("get transaction ret store", resultCapsule);
   }
+
+  @Test
+  public void put() {
+    TransactionInfoCapsule transactionInfoCapsule = new TransactionInfoCapsule();
+    transactionInfoCapsule.setId(transactionId);
+    transactionInfoCapsule.setFee(1000L);
+    transactionInfoCapsule.setBlockNumber(100L);
+    transactionInfoCapsule.setBlockTimeStamp(200L);
+
+    TransactionRetCapsule transactionRetCapsule = new TransactionRetCapsule();
+    transactionRetCapsule.addTransactionInfo(transactionInfoCapsule.getInstance());
+    Assert.assertNull("put transaction info error", transactionRetStore.getUnchecked(transactionInfoCapsule.getId()));
+    transactionRetStore.put(transactionInfoCapsule.getId(), transactionRetCapsule);
+    Assert.assertNotNull("get transaction info error", transactionRetStore.getUnchecked(transactionInfoCapsule.getId()));
+  }
 }