FISCO-BCOS · cyjseagull · Sep 23, 2020 · Sep 23, 2020
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/Contract.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/Contract.java
@@ -41,8 +41,8 @@
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.model.callback.TransactionCallback;
 import org.fisco.bcos.sdk.transaction.codec.decode.ReceiptParser;
-import org.fisco.bcos.sdk.transaction.manager.TransactionManager;
-import org.fisco.bcos.sdk.transaction.manager.TransactionManagerFactory;
+import org.fisco.bcos.sdk.transaction.manager.TransactionProcessor;
+import org.fisco.bcos.sdk.transaction.manager.TransactionProcessorFactory;
 import org.fisco.bcos.sdk.transaction.model.dto.CallRequest;
 import org.fisco.bcos.sdk.transaction.model.exception.ContractException;
 import org.slf4j.Logger;
@@ -54,7 +54,7 @@ public class Contract {
     protected String contractAddress;
     // transactionReceipt after deploying the contract
     protected TransactionReceipt deployReceipt;
-    protected final TransactionManager transactionManager;
+    protected final TransactionProcessor transactionProcessor;
     protected final Client client;
     public static final String FUNC_DEPLOY = "deploy";
     protected final FunctionEncoder functionEncoder;
@@ -69,11 +69,11 @@ protected Contract(
             String contractAddress,
             Client client,
             CryptoKeyPair credential,
-            TransactionManager transactionManager) {
+            TransactionProcessor transactionProcessor) {
         this.contractBinary = contractBinary;
         this.contractAddress = contractAddress;
         this.client = client;
-        this.transactionManager = transactionManager;
+        this.transactionProcessor = transactionProcessor;
         this.credential = credential;
         this.cryptoInterface = client.getCryptoInterface();
         this.functionEncoder = new FunctionEncoder(client.getCryptoInterface());
@@ -96,14 +96,14 @@ protected Contract(
                 contractAddress,
                 client,
                 credential,
-                TransactionManagerFactory.createTransactionManager(client, credential));
+                TransactionProcessorFactory.createTransactionManager(client, credential));
     }
 
     protected static <T extends Contract> T deploy(
             Class<T> type,
             Client client,
             CryptoKeyPair credential,
-            TransactionManager transactionManager,
+            TransactionProcessor transactionManager,
             String binary,
             String encodedConstructor)
             throws ContractException {
@@ -132,7 +132,7 @@ protected static <T extends Contract> T deploy(
                 type,
                 client,
                 credential,
-                TransactionManagerFactory.createTransactionManager(client, credential),
+                TransactionProcessorFactory.createTransactionManager(client, credential),
                 binary,
                 encodedConstructor);
     }
@@ -175,7 +175,7 @@ private List<Type> executeCall(Function function) throws ContractException {
         String encodedFunctionData = functionEncoder.encode(function);
         CallRequest callRequest =
                 new CallRequest(credential.getAddress(), contractAddress, encodedFunctionData);
-        Call response = transactionManager.executeCall(callRequest);
+        Call response = transactionProcessor.executeCall(callRequest);
         // get value from the response
         String callResult = response.getCallResult().getOutput();
         if (!response.getCallResult().getStatus().equals("0x0")) {
@@ -241,7 +241,7 @@ protected List<Type> executeCallWithMultipleValueReturn(Function function)
 
     protected void asyncExecuteTransaction(
             String data, String funName, TransactionCallback callback) {
-        transactionManager.sendTransactionAsync(contractAddress, data, credential, callback);
+        transactionProcessor.sendTransactionAsync(contractAddress, data, credential, callback);
     }
 
     protected void asyncExecuteTransaction(Function function, TransactionCallback callback) {
@@ -253,7 +253,7 @@ protected TransactionReceipt executeTransaction(Function function) {
     }
 
     protected TransactionReceipt executeTransaction(String data, String functionName) {
-        return transactionManager.sendTransactionAndGetReceipt(contractAddress, data, credential);
+        return transactionProcessor.sendTransactionAndGetReceipt(contractAddress, data, credential);
     }
 
     /** Adds a log field to {@link EventValues}. */
@@ -284,7 +284,7 @@ protected String createSignedTransaction(Function function) {
     }
 
     protected String createSignedTransaction(String to, String data) {
-        return transactionManager.createSignedTransaction(to, data, credential);
+        return transactionProcessor.createSignedTransaction(to, data, credential);
     }
 
     public void subscribeEvent(EventLogParams params, EventCallback callback) {
@@ -393,8 +393,8 @@ public static <S extends Type, T> List<T> convertToNative(List<S> arr) {
         return out;
     }
 
-    public TransactionManager getTransactionManager() {
-        return this.transactionManager;
+    public TransactionProcessor getTransactionProcessor() {
+        return this.transactionProcessor;
     }
 
     public String getCurrentExternalAccountAddress() {

diff --git a/...n/manager/AssembleTransactionManager.java → ...manager/AssembleTransactionProcessor.java b/...n/manager/AssembleTransactionManager.java → ...manager/AssembleTransactionProcessor.java
@@ -48,15 +48,15 @@
  *
  * @author maojiayu
  */
-public class AssembleTransactionManager extends TransactionManager
-        implements AssembleTransactionManagerInterface {
-    protected static Logger log = LoggerFactory.getLogger(AssembleTransactionManager.class);
+public class AssembleTransactionProcessor extends TransactionProcessor
+        implements AssembleTransactionProcessorInterface {
+    protected static Logger log = LoggerFactory.getLogger(AssembleTransactionProcessor.class);
     protected final TransactionDecoderInterface transactionDecoder;
     protected final TransactionPusherInterface transactionPusher;
     protected final ABICodec abiCodec;
     private ContractLoader contractLoader;
 
-    public AssembleTransactionManager(
+    public AssembleTransactionProcessor(
             Client client,
             CryptoKeyPair cryptoKeyPair,
             Integer groupId,

diff --git a/.../AssembleTransactionManagerInterface.java → ...ssembleTransactionProcessorInterface.java b/.../AssembleTransactionManagerInterface.java → ...ssembleTransactionProcessorInterface.java
@@ -25,7 +25,7 @@
 import org.fisco.bcos.sdk.transaction.model.exception.NoSuchTransactionFileException;
 import org.fisco.bcos.sdk.transaction.model.exception.TransactionBaseException;
 
-public interface AssembleTransactionManagerInterface {
+public interface AssembleTransactionProcessorInterface {
 
     public TransactionReceipt deployAndGetReceipt(String data);
 

diff --git a/...ansaction/manager/TransactionManager.java → ...saction/manager/TransactionProcessor.java b/...ansaction/manager/TransactionManager.java → ...saction/manager/TransactionProcessor.java
@@ -32,8 +32,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TransactionManager implements TransactionManagerInterface {
-    protected static Logger log = LoggerFactory.getLogger(TransactionManager.class);
+public class TransactionProcessor implements TransactionProcessorInterface {
+    protected static Logger log = LoggerFactory.getLogger(TransactionProcessor.class);
     protected final CryptoInterface cryptoInterface;
     protected final CryptoKeyPair cryptoKeyPair;
     protected final Client client;
@@ -42,7 +42,7 @@ public class TransactionManager implements TransactionManagerInterface {
     protected final TransactionBuilderInterface transactionBuilder;
     protected final TransactionEncoderInterface transactionEncoder;
 
-    public TransactionManager(
+    public TransactionProcessor(
             Client client, CryptoKeyPair cryptoKeyPair, Integer groupId, String chainId) {
         this.cryptoInterface = client.getCryptoInterface();
         this.cryptoKeyPair = cryptoKeyPair;

diff --git a/...on/manager/TransactionManagerFactory.java → .../manager/TransactionProcessorFactory.java b/...on/manager/TransactionManagerFactory.java → .../manager/TransactionProcessorFactory.java
@@ -23,8 +23,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TransactionManagerFactory {
-    private static final Logger logger = LoggerFactory.getLogger(TransactionManagerFactory.class);
+public class TransactionProcessorFactory {
+    private static final Logger logger = LoggerFactory.getLogger(TransactionProcessorFactory.class);
 
     @SuppressWarnings("unlikely-arg-type")
     public static Pair<String, Integer> getChainIdAndGroupId(Client client) {
@@ -53,25 +53,25 @@ public static Pair<String, Integer> getChainIdAndGroupId(Client client) {
         }
     }
 
-    public static TransactionManager createTransactionManager(
+    public static TransactionProcessor createTransactionManager(
             Client client, CryptoKeyPair cryptoKeyPair) {
         Pair<String, Integer> pair = getChainIdAndGroupId(client);
-        return new TransactionManager(client, cryptoKeyPair, pair.getRight(), pair.getLeft());
+        return new TransactionProcessor(client, cryptoKeyPair, pair.getRight(), pair.getLeft());
     }
 
-    public static AssembleTransactionManager createAssembleTransactionManager(
+    public static AssembleTransactionProcessor createAssembleTransactionProcessor(
             Client client, CryptoKeyPair cryptoKeyPair) throws Exception {
         Pair<String, Integer> pair = getChainIdAndGroupId(client);
-        return new AssembleTransactionManager(
+        return new AssembleTransactionProcessor(
                 client, cryptoKeyPair, pair.getRight(), pair.getLeft(), null);
     }
 
-    public static AssembleTransactionManager createAssembleTransactionManager(
+    public static AssembleTransactionProcessor createAssembleTransactionProcessor(
             Client client, CryptoKeyPair cryptoKeyPair, String abiFilePath, String binFilePath)
             throws Exception {
         Pair<String, Integer> pair = getChainIdAndGroupId(client);
         ContractLoader contractLoader = new ContractLoader(abiFilePath, binFilePath);
-        return new AssembleTransactionManager(
+        return new AssembleTransactionProcessor(
                 client, cryptoKeyPair, pair.getRight(), pair.getLeft(), contractLoader);
     }
 }
diff --git a/.../manager/TransactionManagerInterface.java → ...anager/TransactionProcessorInterface.java b/.../manager/TransactionManagerInterface.java → ...anager/TransactionProcessorInterface.java
@@ -25,7 +25,7 @@
  *
  * @author maojiayu
  */
-public interface TransactionManagerInterface {
+public interface TransactionProcessorInterface {
 
     public TransactionReceipt sendTransactionAndGetReceipt(
             String to, String data, CryptoKeyPair cryptoKeyPair);

diff --git a/src/integration-test/java/org/fisco/bcos/sdk/eventsub/SubscribeTest.java b/src/integration-test/java/org/fisco/bcos/sdk/eventsub/SubscribeTest.java
@@ -28,8 +28,8 @@
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
 import org.fisco.bcos.sdk.model.ConstantConfig;
 import org.fisco.bcos.sdk.model.EventLog;
-import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionManager;
-import org.fisco.bcos.sdk.transaction.manager.TransactionManagerFactory;
+import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionProcessor;
+import org.fisco.bcos.sdk.transaction.manager.TransactionProcessorFactory;
 import org.fisco.bcos.sdk.transaction.model.dto.TransactionResponse;
 import org.fisco.bcos.sdk.transaction.tools.JsonUtils;
 import org.junit.Assert;
@@ -58,8 +58,8 @@ public void testEventSubModule() {
         eventSubscribe.start();
         String contractAddress = "";
         try {
-            AssembleTransactionManager manager =
-                    TransactionManagerFactory.createAssembleTransactionManager(
+            AssembleTransactionProcessor manager =
+                    TransactionProcessorFactory.createAssembleTransactionProcessor(
                             client, client.getCryptoInterface().createKeyPair(), abiFile, binFile);
             // deploy
             List<Object> params = Lists.newArrayList();

diff --git a/src/integration-test/java/org/fisco/bcos/sdk/transaction/decoder/EventDecodeTest.java b/src/integration-test/java/org/fisco/bcos/sdk/transaction/decoder/EventDecodeTest.java
@@ -21,8 +21,8 @@
 import org.fisco.bcos.sdk.abi.ABICodec;
 import org.fisco.bcos.sdk.client.Client;
 import org.fisco.bcos.sdk.model.ConstantConfig;
-import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionManager;
-import org.fisco.bcos.sdk.transaction.manager.TransactionManagerFactory;
+import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionProcessor;
+import org.fisco.bcos.sdk.transaction.manager.TransactionProcessorFactory;
 import org.fisco.bcos.sdk.transaction.model.dto.TransactionResponse;
 import org.junit.Assert;
 import org.junit.Test;
@@ -47,8 +47,8 @@ public void testDecode() throws Exception {
         BcosSDK sdk = BcosSDK.build(configFile);
         Client client = sdk.getClient(Integer.valueOf(1));
         // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress());
-        AssembleTransactionManager manager =
-                TransactionManagerFactory.createAssembleTransactionManager(
+        AssembleTransactionProcessor manager =
+                TransactionProcessorFactory.createAssembleTransactionProcessor(
                         client, client.getCryptoInterface().createKeyPair(), abiFile, binFile);
         ABICodec abiCodec = new ABICodec(client.getCryptoInterface());
         // deploy

diff --git a/...ation-test/java/org/fisco/bcos/sdk/transaction/decoder/TransactionDecoderServiceTest.java b/...ation-test/java/org/fisco/bcos/sdk/transaction/decoder/TransactionDecoderServiceTest.java
@@ -25,8 +25,8 @@
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.codec.decode.TransactionDecoderInterface;
 import org.fisco.bcos.sdk.transaction.codec.decode.TransactionDecoderService;
-import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionManager;
-import org.fisco.bcos.sdk.transaction.manager.TransactionManagerFactory;
+import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionProcessor;
+import org.fisco.bcos.sdk.transaction.manager.TransactionProcessorFactory;
 import org.fisco.bcos.sdk.transaction.model.dto.TransactionResponse;
 import org.fisco.bcos.sdk.transaction.tools.ContractLoader;
 import org.fisco.bcos.sdk.transaction.tools.JsonUtils;
@@ -54,8 +54,8 @@ public void testDecode() throws Exception {
                 new TransactionDecoderService(client.getCryptoInterface());
         ContractLoader contractLoader = new ContractLoader(abiFile, binFile);
         String abi = contractLoader.getABIByContractName(contractName);
-        AssembleTransactionManager manager =
-                TransactionManagerFactory.createAssembleTransactionManager(
+        AssembleTransactionProcessor manager =
+                TransactionProcessorFactory.createAssembleTransactionProcessor(
                         client, client.getCryptoInterface().createKeyPair(), abiFile, binFile);
         // deploy
         List<Object> params = Lists.newArrayList();