resolve circular references

Yrp · Yrp · commit 51e59536f480 · 2018-08-13T13:35:33.000+08:00
diff --git a/src/main/java/org/tron/common/utils/ForkController.java b/src/main/java/org/tron/common/utils/ForkController.java
@@ -2,9 +2,7 @@
 
 import com.google.protobuf.ByteString;
 import java.util.List;
-import javax.annotation.PostConstruct;
 import lombok.Getter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.capsule.TransactionCapsule;
@@ -22,8 +20,8 @@ public class ForkController {
   private volatile int[] slots;
   private boolean fork = false;
 
-  @PostConstruct
-  public void init() {
+  public void init(Manager manager) {
+    this.manager = manager;
     int size = manager.getWitnessController().getActiveWitnesses().size();
     slots = new int[size];
   }
@@ -43,7 +41,7 @@ public synchronized boolean shouldBeForked() {
     return true;
   }
 
-  public boolean dealOrNot(TransactionCapsule capsule) {
+  public boolean forkOrNot(TransactionCapsule capsule) {
     return shouldBeForked()
         || capsule.getInstance().getRawData().getContractList().get(0).getType().getNumber()
         <= DISCARD_SCOPE;
@@ -62,9 +60,4 @@ public synchronized void update(BlockCapsule blockCapsule) {
     slots[slot] = blockCapsule.getInstance().getBlockHeader().getRawData().getVersion();
   }
 
-  @Autowired
-  public void setManager(Manager manager) {
-    this.manager = manager;
-  }
-
 }
diff --git a/src/main/java/org/tron/core/Wallet.java b/src/main/java/org/tron/core/Wallet.java
@@ -375,7 +375,7 @@ public GrpcAPI.Return broadcastTransaction(Transaction signaturedTransaction) {
       }
 
       dbManager.pushTransactions(trx);
-      if (dbManager.getForkController().dealOrNot(trx)) {
+      if (dbManager.getForkController().forkOrNot(trx)) {
         p2pNode.broadcast(message);
       }
       return builder.setResult(true).setCode(response_code.SUCCESS).build();
diff --git a/src/main/java/org/tron/core/db/Manager.java b/src/main/java/org/tron/core/db/Manager.java
@@ -334,6 +334,7 @@ public void init() {
           Args.getInstance().getOutputDirectory());
       System.exit(1);
     }
+    forkController.init(this);
     revokingStore.enable();
 
 //    this.codeStore = CodeStore.create("code");
@@ -1085,7 +1086,7 @@ public synchronized BlockCapsule generateBlock(
 //        trx.resetResult();
         tmpSeesion.merge();
         // push into block
-        if (forkController.dealOrNot(trx)) {
+        if (forkController.forkOrNot(trx)) {
           blockCapsule.addTransaction(trx);
         }
         iterator.remove();
diff --git a/src/main/java/org/tron/core/net/node/NodeDelegate.java b/src/main/java/org/tron/core/net/node/NodeDelegate.java
@@ -50,5 +50,5 @@ Deque<BlockId> getBlockChainSummary(BlockId beginBLockId, Deque<BlockId> blockId
 
   boolean canChainRevoke(long num);
 
-  boolean dealOrNot(TransactionCapsule transactionCapsule);
+  boolean forkOrNot(TransactionCapsule transactionCapsule);
 }
diff --git a/src/main/java/org/tron/core/net/node/NodeDelegateImpl.java b/src/main/java/org/tron/core/net/node/NodeDelegateImpl.java
@@ -385,7 +385,7 @@ public boolean canChainRevoke(long num) {
   }
 
   @Override
-  public boolean dealOrNot(TransactionCapsule transactionCapsule) {
-    return dbManager.getForkController().dealOrNot(transactionCapsule);
+  public boolean forkOrNot(TransactionCapsule transactionCapsule) {
+    return dbManager.getForkController().forkOrNot(transactionCapsule);
   }
 }
diff --git a/src/main/java/org/tron/core/net/node/NodeImpl.java b/src/main/java/org/tron/core/net/node/NodeImpl.java
@@ -861,7 +861,7 @@ private void onHandleTransactionMessage(PeerConnection peer, TransactionMessage
         return;
       }
       if (del.handleTransaction(trxMsg.getTransactionCapsule())
-          && del.dealOrNot(trxMsg.getTransactionCapsule())) {
+          && del.forkOrNot(trxMsg.getTransactionCapsule())) {
         broadcast(trxMsg);
       }
     } catch (TraitorPeerException e) {

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ public GrpcAPI.Return broadcastTransaction(Transaction signaturedTransaction) {`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`dbManager.pushTransactions(trx);`
`378`		`- if (dbManager.getForkController().dealOrNot(trx)) {`
	`378`	`+ if (dbManager.getForkController().forkOrNot(trx)) {`
`379`	`379`	`p2pNode.broadcast(message);`
`380`	`380`	`}`
`381`	`381`	`return builder.setResult(true).setCode(response_code.SUCCESS).build();`
Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,5 @@ Deque<BlockId> getBlockChainSummary(BlockId beginBLockId, Deque<BlockId> blockId`
`50`	`50`
`51`	`51`	`boolean canChainRevoke(long num);`
`52`	`52`
`53`		`- boolean dealOrNot(TransactionCapsule transactionCapsule);`
	`53`	`+ boolean forkOrNot(TransactionCapsule transactionCapsule);`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ public boolean canChainRevoke(long num) {`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`@Override`
`388`		`- public boolean dealOrNot(TransactionCapsule transactionCapsule) {`
`389`		`- return dbManager.getForkController().dealOrNot(transactionCapsule);`
	`388`	`+ public boolean forkOrNot(TransactionCapsule transactionCapsule) {`
	`389`	`+ return dbManager.getForkController().forkOrNot(transactionCapsule);`
`390`	`390`	`}`
`391`	`391`	`}`
Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ private void onHandleTransactionMessage(PeerConnection peer, TransactionMessage`
`861`	`861`	`return;`
`862`	`862`	`}`
`863`	`863`	`if (del.handleTransaction(trxMsg.getTransactionCapsule())`
`864`		`- && del.dealOrNot(trxMsg.getTransactionCapsule())) {`
	`864`	`+ && del.forkOrNot(trxMsg.getTransactionCapsule())) {`
`865`	`865`	`broadcast(trxMsg);`
`866`	`866`	`}`
`867`	`867`	`} catch (TraitorPeerException e) {`