Merge pull request tronprotocol#3221 from BentoCrypto/develop

xxo1shine · web-flow · commit 33e4a4ec0000 · 2020-06-30T15:22:57.000+08:00
fix words error
diff --git a/chainbase/src/main/java/org/tron/common/utils/ForkController.java b/chainbase/src/main/java/org/tron/common/utils/ForkController.java
@@ -59,7 +59,7 @@ public synchronized boolean pass(int version) {
   // version !=5, skip this.
   private boolean checkForEnergyLimit() {
     long blockNum = manager.getDynamicPropertiesStore().getLatestBlockHeaderNumber();
-    return blockNum >= CommonParameter.getInstance().getBlockNumForEneryLimit();
+    return blockNum >= CommonParameter.getInstance().getBlockNumForEnergyLimit();
   }
 
   private boolean check(byte[] stats) {
diff --git a/chainbase/src/main/java/org/tron/core/capsule/ReceiptCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/ReceiptCapsule.java
@@ -43,7 +43,7 @@ public static ResourceReceipt copyReceipt(ReceiptCapsule origin) {
   public static boolean checkForEnergyLimit(DynamicPropertiesStore ds) {
     long blockNum = ds.getLatestBlockHeaderNumber();
     return blockNum >= CommonParameter.getInstance()
-        .getBlockNumForEneryLimit();
+        .getBlockNumForEnergyLimit();
   }
 
   public ResourceReceipt getReceipt() {
diff --git a/common/src/main/java/org/tron/common/logsfilter/trigger/TransactionLogTrigger.java b/common/src/main/java/org/tron/common/logsfilter/trigger/TransactionLogTrigger.java
@@ -71,7 +71,7 @@ public class TransactionLogTrigger extends Trigger {
   //internal transaction
   @Getter
   @Setter
-  private List<InternalTransactionPojo> internalTrananctionList;
+  private List<InternalTransactionPojo> internalTransactionList;
   @Getter
   @Setter
   private String data;
diff --git a/common/src/main/java/org/tron/common/overlay/discover/node/Node.java b/common/src/main/java/org/tron/common/overlay/discover/node/Node.java
@@ -62,8 +62,8 @@ public static byte[] getNodeId() {
     return id;
   }
 
-  public boolean isConnectible(int argsP2pversion) {
-    return port == bindPort && p2pVersion == argsP2pversion;
+  public boolean isConnectible(int argsP2PVersion) {
+    return port == bindPort && p2pVersion == argsP2PVersion;
   }
 
   public String getHexId() {
diff --git a/common/src/main/java/org/tron/common/parameter/CommonParameter.java b/common/src/main/java/org/tron/common/parameter/CommonParameter.java
@@ -302,7 +302,7 @@ public class CommonParameter {
   public boolean fullNodeAllowShieldedTransactionArgs;
   @Getter
   @Setter
-  public long blockNumForEneryLimit;
+  public long blockNumForEnergyLimit;
   @Getter
   @Setter
   @Parameter(names = {"--es"})
diff --git a/framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java b/framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java
@@ -38,29 +38,29 @@ public class TransactionLogTriggerCapsule extends TriggerCapsule {
   @Setter
   private TransactionLogTrigger transactionLogTrigger;
 
-  public TransactionLogTriggerCapsule(TransactionCapsule trxCasule, BlockCapsule blockCapsule) {
+  public TransactionLogTriggerCapsule(TransactionCapsule trxCapsule, BlockCapsule blockCapsule) {
     transactionLogTrigger = new TransactionLogTrigger();
     if (Objects.nonNull(blockCapsule)) {
       transactionLogTrigger.setBlockHash(blockCapsule.getBlockId().toString());
     }
-    transactionLogTrigger.setTransactionId(trxCasule.getTransactionId().toString());
+    transactionLogTrigger.setTransactionId(trxCapsule.getTransactionId().toString());
     transactionLogTrigger.setTimeStamp(blockCapsule.getTimeStamp());
-    transactionLogTrigger.setBlockNumber(trxCasule.getBlockNum());
-    transactionLogTrigger.setData(Hex.toHexString(trxCasule
+    transactionLogTrigger.setBlockNumber(trxCapsule.getBlockNum());
+    transactionLogTrigger.setData(Hex.toHexString(trxCapsule
         .getInstance().getRawData().getData().toByteArray()));
 
-    TransactionTrace trxTrace = trxCasule.getTrxTrace();
+    TransactionTrace trxTrace = trxCapsule.getTrxTrace();
 
     //result
-    if (Objects.nonNull(trxCasule.getContractRet())) {
-      transactionLogTrigger.setResult(trxCasule.getContractRet().toString());
+    if (Objects.nonNull(trxCapsule.getContractRet())) {
+      transactionLogTrigger.setResult(trxCapsule.getContractRet().toString());
     }
 
-    if (Objects.nonNull(trxCasule.getInstance().getRawData())) {
+    if (Objects.nonNull(trxCapsule.getInstance().getRawData())) {
       // fee limit
-      transactionLogTrigger.setFeeLimit(trxCasule.getInstance().getRawData().getFeeLimit());
+      transactionLogTrigger.setFeeLimit(trxCapsule.getInstance().getRawData().getFeeLimit());
 
-      Protocol.Transaction.Contract contract = trxCasule.getInstance().getRawData().getContract(0);
+      Protocol.Transaction.Contract contract = trxCapsule.getInstance().getRawData().getContract(0);
       Any contractParameter = null;
       // contract type
       if (Objects.nonNull(contract)) {
@@ -149,7 +149,7 @@ public TransactionLogTriggerCapsule(TransactionCapsule trxCasule, BlockCapsule b
       }
 
       // internal transaction
-      transactionLogTrigger.setInternalTrananctionList(
+      transactionLogTrigger.setInternalTransactionList(
           getInternalTransactionList(programResult.getInternalTransactions()));
     }
   }
diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java
@@ -617,7 +617,7 @@ public static void setParam(final String[] args, final String confFileName) {
     PARAMETER.minEffectiveConnection = config.hasPath(Constant.NODE_RPC_MIN_EFFECTIVE_CONNECTION)
         ? config.getInt(Constant.NODE_RPC_MIN_EFFECTIVE_CONNECTION) : 1;
 
-    PARAMETER.blockNumForEneryLimit = config.hasPath(Constant.ENERGY_LIMIT_BLOCK_NUM)
+    PARAMETER.blockNumForEnergyLimit = config.hasPath(Constant.ENERGY_LIMIT_BLOCK_NUM)
         ? config.getInt(Constant.ENERGY_LIMIT_BLOCK_NUM) : 4727890L;
 
     PARAMETER.vmTrace =
diff --git a/framework/src/test/java/org/tron/common/runtime/vm/DepositTest.java b/framework/src/test/java/org/tron/common/runtime/vm/DepositTest.java
@@ -107,7 +107,7 @@ public void loopCallTest()
         .statsByVersion(ForkBlockVersionConsts.ENERGY_LIMIT, stats);
     this.manager.getDynamicPropertiesStore()
         .saveLatestBlockHeaderNumber(CommonParameter.getInstance()
-            .getBlockNumForEneryLimit() + 1);
+            .getBlockNumForEnergyLimit() + 1);
 
     String contractA = "A";
     String contractB = "B";

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public synchronized boolean pass(int version) {`
`59`	`59`	`// version !=5, skip this.`
`60`	`60`	`private boolean checkForEnergyLimit() {`
`61`	`61`	`long blockNum = manager.getDynamicPropertiesStore().getLatestBlockHeaderNumber();`
`62`		`- return blockNum >= CommonParameter.getInstance().getBlockNumForEneryLimit();`
	`62`	`+ return blockNum >= CommonParameter.getInstance().getBlockNumForEnergyLimit();`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`private boolean check(byte[] stats) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static ResourceReceipt copyReceipt(ReceiptCapsule origin) {`
`43`	`43`	`public static boolean checkForEnergyLimit(DynamicPropertiesStore ds) {`
`44`	`44`	`long blockNum = ds.getLatestBlockHeaderNumber();`
`45`	`45`	`return blockNum >= CommonParameter.getInstance()`
`46`		`- .getBlockNumForEneryLimit();`
	`46`	`+ .getBlockNumForEnergyLimit();`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public ResourceReceipt getReceipt() {`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ public static byte[] getNodeId() {`
`62`	`62`	`return id;`
`63`	`63`	`}`
`64`	`64`
`65`		`- public boolean isConnectible(int argsP2pversion) {`
`66`		`- return port == bindPort && p2pVersion == argsP2pversion;`
	`65`	`+ public boolean isConnectible(int argsP2PVersion) {`
	`66`	`+ return port == bindPort && p2pVersion == argsP2PVersion;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public String getHexId() {`