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 index 606b84bea..8265336c7 100644 --- 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 deploy( Class type, Client client, CryptoKeyPair credential, - TransactionManager transactionManager, + TransactionProcessor transactionManager, String binary, String encodedConstructor) throws ContractException { @@ -132,7 +132,7 @@ protected static T deploy( type, client, credential, - TransactionManagerFactory.createTransactionManager(client, credential), + TransactionProcessorFactory.createTransactionManager(client, credential), binary, encodedConstructor); } @@ -175,7 +175,7 @@ private List 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 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 List convertToNative(List arr) { return out; } - public TransactionManager getTransactionManager() { - return this.transactionManager; + public TransactionProcessor getTransactionProcessor() { + return this.transactionProcessor; } public String getCurrentExternalAccountAddress() { diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionManager.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java similarity index 98% rename from sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionManager.java rename to sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java index 2ebf72c6e..206f786d0 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionManager.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/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/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionManagerInterface.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorInterface.java similarity index 98% rename from sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionManagerInterface.java rename to sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorInterface.java index ef03d3e4f..b96176249 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionManagerInterface.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorInterface.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/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionManager.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessor.java similarity index 94% rename from sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionManager.java rename to sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessor.java index cbe3dd9b4..09b948ab3 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionManager.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/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/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionManagerFactory.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessorFactory.java similarity index 85% rename from sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionManagerFactory.java rename to sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessorFactory.java index f758bec4e..c302c23a6 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionManagerFactory.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/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 getChainIdAndGroupId(Client client) { @@ -53,25 +53,25 @@ public static Pair getChainIdAndGroupId(Client client) { } } - public static TransactionManager createTransactionManager( + public static TransactionProcessor createTransactionManager( Client client, CryptoKeyPair cryptoKeyPair) { Pair 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 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 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/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionManagerInterface.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessorInterface.java similarity index 96% rename from sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionManagerInterface.java rename to sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessorInterface.java index 91d060e3e..6a6bc9274 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionManagerInterface.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/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 index e4fba38f5..86ad3958d 100644 --- 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 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 index f7b64527a..86b8688f6 100644 --- 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/src/integration-test/java/org/fisco/bcos/sdk/transaction/decoder/TransactionDecoderServiceTest.java b/src/integration-test/java/org/fisco/bcos/sdk/transaction/decoder/TransactionDecoderServiceTest.java index 08a73d76a..e9674dc45 100644 --- a/src/integration-test/java/org/fisco/bcos/sdk/transaction/decoder/TransactionDecoderServiceTest.java +++ b/src/integration-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 params = Lists.newArrayList(); diff --git a/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionManagerTest.java b/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java similarity index 85% rename from src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionManagerTest.java rename to src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java index 98ffe5a82..315d6cc1d 100644 --- a/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionManagerTest.java +++ b/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java @@ -42,13 +42,13 @@ import org.junit.runners.MethodSorters; /** - * TransactionManagerTest @Description: TransactionManagerTest + * TransactionProcessorTest @Description: TransactionProcessorTest * * @author maojiayu * @data Aug 13, 2020 8:00:11 PM */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class AssembleTransactionManagerTest { +public class AssembleTransactionProcessorTest { private static final String configFile = "src/integration-test/resources/" + ConstantConfig.CONFIG_FILE_NAME; private static final String abiFile = "src/integration-test/resources/abi/"; @@ -62,12 +62,12 @@ public void test1HelloWorld() throws Exception { Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); - AssembleTransactionManager manager = - TransactionManagerFactory.createAssembleTransactionManager( + AssembleTransactionProcessor transactionProcessor = + TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); // deploy TransactionResponse response = - manager.deployByContractLoader("HelloWorld", new ArrayList<>()); + transactionProcessor.deployByContractLoader("HelloWorld", new ArrayList<>()); // System.out.println(JsonUtils.toJson(response)); if (!response.getTransactionReceipt().getStatus().equals("0x0")) { return; @@ -82,7 +82,7 @@ public void test1HelloWorld() throws Exception { "0x0000000000000000000000000000000000000000000000000000000000000000")); // call CallResponse callResponse1 = - manager.sendCallByContractLoader( + transactionProcessor.sendCallByContractLoader( "HelloWorld", helloWorldAddrss, "name", new ArrayList<>()); // System.out.println(JsonUtils.toJson(callResponse1)); List l = JsonUtils.fromJsonList(callResponse1.getValues(), Object.class); @@ -92,19 +92,19 @@ public void test1HelloWorld() throws Exception { List params = new ArrayList<>(); params.add("test"); TransactionReceipt tr = - manager.sendTransactionAndGetReceiptByContractLoader( + transactionProcessor.sendTransactionAndGetReceiptByContractLoader( "HelloWorld", helloWorldAddrss, "set", params); Assert.assertEquals("0x0", tr.getStatus()); // System.out.println(JsonUtils.toJson(tr)); TransactionResponse res = - manager.sendTransactionAndGetResponseByContractLoader( + transactionProcessor.sendTransactionAndGetResponseByContractLoader( "HelloWorld", helloWorldAddrss, "set", params); Assert.assertEquals("0x0", res.getTransactionReceipt().getStatus()); // System.out.println(JsonUtils.toJson(res)); // call CallResponse callResponse2 = - manager.sendCallByContractLoader( + transactionProcessor.sendCallByContractLoader( "HelloWorld", helloWorldAddrss, "name", new ArrayList<>()); // System.out.println(JsonUtils.toJson(callResponse2)); l = JsonUtils.fromJsonList(callResponse2.getValues(), Object.class); @@ -118,14 +118,15 @@ public void test2ComplexDeploy() throws Exception { Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); - AssembleTransactionManager manager = - TransactionManagerFactory.createAssembleTransactionManager( + AssembleTransactionProcessor transactionProcessor = + TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); // deploy List params = Lists.newArrayList(); params.add(1); params.add("test2"); - TransactionResponse response = manager.deployByContractLoader("ComplexSol", params); + TransactionResponse response = + transactionProcessor.deployByContractLoader("ComplexSol", params); // System.out.println(JsonUtils.toJson(response)); if (!response.getTransactionReceipt().getStatus().equals("0x0")) { System.out.println(response.getReturnMessage()); @@ -151,21 +152,22 @@ public void test3ComplexQuery() throws Exception { Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); - AssembleTransactionManager manager = - TransactionManagerFactory.createAssembleTransactionManager( + AssembleTransactionProcessor transactionProcessor = + TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); // deploy List params = Lists.newArrayList(); params.add(1); params.add("test2"); - TransactionResponse response = manager.deployByContractLoader("ComplexSol", params); + TransactionResponse response = + transactionProcessor.deployByContractLoader("ComplexSol", params); if (!response.getTransactionReceipt().getStatus().equals("0x0")) { return; } String contractAddress = response.getContractAddress(); // query i and s CallResponse callResponse1 = - manager.sendCallByContractLoader( + transactionProcessor.sendCallByContractLoader( "ComplexSol", contractAddress, "_intV", new ArrayList<>()); // System.out.println(JsonUtils.toJson(callResponse1)); // System.out.println("callResponse1 : " + callResponse1.getReturnMessage()); @@ -176,7 +178,7 @@ public void test3ComplexQuery() throws Exception { Assert.assertEquals(entities.get(0), 1); } CallResponse callResponse2 = - manager.sendCallByContractLoader( + transactionProcessor.sendCallByContractLoader( "ComplexSol", contractAddress, "_s", new ArrayList<>()); // System.out.println("callResponse2 : " + callResponse2.getReturnMessage()); if (callResponse2.getReturnCode() == PrecompiledRetCode.CODE_SUCCESS.getCode()) { @@ -197,21 +199,22 @@ public void test4ComplexEmptyTx() throws Exception { Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); - AssembleTransactionManager manager = - TransactionManagerFactory.createAssembleTransactionManager( + AssembleTransactionProcessor transactionProcessor = + TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); // deploy List params = Lists.newArrayList(); params.add(1); params.add("test2"); - TransactionResponse response = manager.deployByContractLoader("ComplexSol", params); + TransactionResponse response = + transactionProcessor.deployByContractLoader("ComplexSol", params); if (!response.getTransactionReceipt().getStatus().equals("0x0")) { return; } String contractAddress = response.getContractAddress(); // send empty tx TransactionReceipt tr = - manager.sendTransactionAndGetReceiptByContractLoader( + transactionProcessor.sendTransactionAndGetReceiptByContractLoader( "ComplexSol", contractAddress, "emptyArgs", ListUtils.emptyIfNull(null)); Assert.assertEquals("0x0", tr.getStatus()); } @@ -222,20 +225,21 @@ public void test5ComplexIncrement() throws Exception { Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); - AssembleTransactionManager manager = - TransactionManagerFactory.createAssembleTransactionManager( + AssembleTransactionProcessor transactionProcessor = + TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); // deploy List params = Lists.newArrayList(); params.add(1); params.add("test2"); - TransactionResponse response = manager.deployByContractLoader("ComplexSol", params); + TransactionResponse response = + transactionProcessor.deployByContractLoader("ComplexSol", params); if (!response.getTransactionReceipt().getStatus().equals("0x0")) { return; } String contractAddress = response.getContractAddress(); // increment v - manager.sendTransactionAsync( + transactionProcessor.sendTransactionAsync( contractAddress, abi, "incrementUint256", @@ -248,7 +252,7 @@ public void onResponse(TransactionReceipt receipt) { CallResponse callResponse3; try { callResponse3 = - manager.sendCall( + transactionProcessor.sendCall( cryptoKeyPair.getAddress(), contractAddress, abi, @@ -269,14 +273,15 @@ public void test6ComplexSetValues() throws Exception { Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); - AssembleTransactionManager manager = - TransactionManagerFactory.createAssembleTransactionManager( + AssembleTransactionProcessor transactionProcessor = + TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); // deploy List params = Lists.newArrayList(); params.add(1); params.add("test2"); - TransactionResponse response = manager.deployByContractLoader("ComplexSol", params); + TransactionResponse response = + transactionProcessor.deployByContractLoader("ComplexSol", params); if (!response.getTransactionReceipt().getStatus().equals("0x0")) { return; } @@ -288,7 +293,7 @@ public void test6ComplexSetValues() throws Exception { paramsSetValues.add(a); paramsSetValues.add("set values 字符串"); TransactionResponse transactionResponse = - manager.sendTransactionAndGetResponse( + transactionProcessor.sendTransactionAndGetResponse( contractAddress, abi, "setValues", paramsSetValues); // System.out.println(JsonUtils.toJson(transactionResponse)); Map> eventsMap = transactionResponse.getEventResultMap(); @@ -302,14 +307,15 @@ public void test7ComplexSetBytes() throws Exception { Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); - AssembleTransactionManager manager = - TransactionManagerFactory.createAssembleTransactionManager( + AssembleTransactionProcessor transactionProcessor = + TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); // deploy List params = Lists.newArrayList(); params.add(1); params.add("test2"); - TransactionResponse response = manager.deployByContractLoader("ComplexSol", params); + TransactionResponse response = + transactionProcessor.deployByContractLoader("ComplexSol", params); if (!response.getTransactionReceipt().getStatus().equals("0x0")) { return; } @@ -318,7 +324,7 @@ public void test7ComplexSetBytes() throws Exception { List paramsSetBytes = Lists.newArrayList(Base64.toBase64String("set bytes test".getBytes())); TransactionResponse transactionResponse3 = - manager.sendTransactionWithStringParamsAndGetResponse( + transactionProcessor.sendTransactionWithStringParamsAndGetResponse( contractAddress, abi, "setBytes", paramsSetBytes); // System.out.println(JsonUtils.toJson(transactionResponse3)); Assert.assertEquals(transactionResponse3.getValuesList().size(), 1); @@ -331,7 +337,7 @@ public void test7ComplexSetBytes() throws Exception { // getBytes CallResponse callResponse4 = - manager.sendCall( + transactionProcessor.sendCall( cryptoKeyPair.getAddress(), contractAddress, abi, @@ -349,22 +355,25 @@ public void test8ComplexSetBytesFuture() throws Exception { Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); - AssembleTransactionManager manager = - TransactionManagerFactory.createAssembleTransactionManager( + AssembleTransactionProcessor transactionProcessor = + TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); // deploy List params = Lists.newArrayList(); params.add(1); params.add("test2"); - TransactionResponse response = manager.deployByContractLoader("ComplexSol", params); + TransactionResponse response = + transactionProcessor.deployByContractLoader("ComplexSol", params); if (!response.getTransactionReceipt().getStatus().equals("0x0")) { return; } String contractAddress = response.getContractAddress(); List paramsSetBytes = Lists.newArrayList("2".getBytes()); - String data = manager.encodeFunction(abi, "setBytes", paramsSetBytes); - String signedData = manager.createSignedTransaction(contractAddress, data, cryptoKeyPair); - CompletableFuture future = manager.sendTransactionAsync(signedData); + String data = transactionProcessor.encodeFunction(abi, "setBytes", paramsSetBytes); + String signedData = + transactionProcessor.createSignedTransaction(contractAddress, data, cryptoKeyPair); + CompletableFuture future = + transactionProcessor.sendTransactionAsync(signedData); future.thenAccept( r -> { Assert.assertEquals("0x0", response.getTransactionReceipt().getStatus());