rm useless code

vae520283995 · Nov 11, 2020 · 4fe888b · 4fe888b
1 parent af76742
commit 4fe888b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 27 deletions.
diff --git a/chainbase/src/main/java/org/tron/core/service/MortgageService.java b/chainbase/src/main/java/org/tron/core/service/MortgageService.java
@@ -144,8 +144,6 @@ public void withdrawReward(byte[] address) {
 
   public void payTransactionFeeReward(byte[] witnessAddress, long value) {
     logger.debug("pay {} transaction fee reward {}", Hex.toHexString(witnessAddress), value);
-    long cycle = dynamicPropertiesStore.getCurrentCycleNumber();
-    delegationStore.addTransactionFeeReward(cycle, witnessAddress, value);
     payReward(witnessAddress, value);
   }
 

diff --git a/chainbase/src/main/java/org/tron/core/store/DelegationStore.java b/chainbase/src/main/java/org/tron/core/store/DelegationStore.java
@@ -71,28 +71,6 @@ public long getVoteReward(long cycle, byte[] address) {
     }
   }
 
-
-  public void addTransactionFeeReward(long cycle, byte[] address, long value) {
-    byte[] key = buildRewardBlockKey(cycle, address);
-    BytesCapsule bytesCapsule = get(key);
-
-    if (bytesCapsule == null) {
-      put(key, new BytesCapsule(ByteArray.fromLong(value)));
-    } else {
-      put(key, new BytesCapsule(ByteArray
-          .fromLong(ByteArray.toLong(bytesCapsule.getData()) + value)));
-    }
-  }
-
-  public long getTransactionFeeReward(long cycle, byte[] address) {
-    BytesCapsule bytesCapsule = get(buildRewardBlockKey(cycle, address));
-    if (bytesCapsule == null) {
-      return 0L;
-    } else {
-      return ByteArray.toLong(bytesCapsule.getData());
-    }
-  }
-
   public void addReward(long cycle, byte[] address, long value) {
     byte[] key = buildRewardKey(cycle, address);
     BytesCapsule bytesCapsule = get(key);

diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java
@@ -1357,9 +1357,8 @@ private void payReward(BlockCapsule block) {
         long transactionFeeReward = Math
             .floorDiv(chainBaseManager.getDynamicPropertiesStore().getTransactionFeePool(),
                 Constant.TRANSACTION_FEE_POOL_PERIOD);
-
-        mortgageService.payBlockReward(witnessCapsule.getAddress().toByteArray(),transactionFeeReward);
-
+        mortgageService.payTransactionFeeReward(witnessCapsule.getAddress().toByteArray(),
+            transactionFeeReward);
       }
     } else {
       byte[] witness = block.getWitnessAddress().toByteArray();