From d2f3b50fc9c5ce55ef873dfa40a7e8c070b7271a Mon Sep 17 00:00:00 2001 From: cyjseagull Date: Wed, 23 Sep 2020 14:19:13 +0800 Subject: [PATCH] rename CryptoInterface to CryptoSuite --- .ci/ci_check_commit.sh | 2 +- .../java/org/fisco/bcos/sdk/abi/ABICodec.java | 30 ++--- .../org/fisco/bcos/sdk/abi/EventEncoder.java | 22 ++-- .../fisco/bcos/sdk/abi/FunctionEncoder.java | 22 ++-- .../fisco/bcos/sdk/abi/tools/TopicTools.java | 12 +- .../bcos/sdk/abi/wrapper/ABIDefinition.java | 6 +- .../sdk/abi/wrapper/ABIDefinitionFactory.java | 11 +- .../abi/wrapper/ContractABIDefinition.java | 10 +- .../bcos/sdk/{ => test}/abi/ABICodecTest.java | 6 +- .../sdk/{ => test}/abi/ABIDefinitionTest.java | 0 .../bcos/sdk/{ => test}/abi/ABIEventTest.java | 2 +- .../{ => test}/abi/ABIObjectCodecTest.java | 0 .../{ => test}/abi/ABIObjectFactoryTest.java | 52 ++++---- .../sdk/{ => test}/abi/ABIObjectTest.java | 0 .../sdk/{ => test}/abi/ContractTypeTest.java | 0 .../bcos/sdk/{ => test}/abi/TableTest.java | 8 +- .../fisco/bcos/sdk/{ => test}/abi/Utils.java | 10 +- .../bcos/sdk/amop/topic/AmopMsgHandler.java | 14 +-- .../bcos/sdk/amop/AmopMsgHandlerTest.java | 8 +- .../sdk/codegen/SolidityContractWrapper.java | 8 +- ...{CryptoInterface.java => CryptoSuite.java} | 12 +- .../UnsupportedCryptoTypeException.java | 2 +- .../org/fisco/bcos/sdk/crypto/HashTest.java | 43 ++++--- .../fisco/bcos/sdk/crypto/KeyToolTest.java | 6 +- .../fisco/bcos/sdk/crypto/SignatureTest.java | 118 +++++++++--------- .../bcos/sdk/demo/contract/DagTransfer.java | 12 +- .../bcos/sdk/demo/contract/HelloWorld.java | 13 +- .../org/fisco/bcos/sdk/demo/contract/Ok.java | 12 +- .../org/fisco/bcos/sdk/demo/contract/OkD.java | 12 +- .../bcos/sdk/demo/contract/ParallelOk.java | 13 +- .../bcos/sdk/demo/contract/TableTest.java | 13 +- .../org/fisco/bcos/sdk/demo/event/SendOk.java | 2 +- .../bcos/sdk/demo/perf/ParallelOkPerf.java | 5 +- .../bcos/sdk/demo/perf/PerformanceOk.java | 2 +- .../bcos/sdk/demo/perf/PerformanceOkD.java | 2 +- .../bcos/sdk/demo/perf/PerformanceTable.java | 2 +- .../perf/parallel/DagPrecompiledDemo.java | 2 +- .../org/fisco/bcos/sdk/client/Client.java | 9 +- .../org/fisco/bcos/sdk/client/ClientImpl.java | 16 +-- .../org/fisco/bcos/sdk/contract/Contract.java | 10 +- .../precompiled/cns/CNSPrecompiled.java | 16 +-- .../consensus/ConsensusPrecompiled.java | 12 +- .../ContractLifeCyclePrecompiled.java | 12 +- .../sdk/contract/precompiled/crud/CRUD.java | 12 +- .../precompiled/crud/table/TableFactory.java | 12 +- .../ChainGovernancePrecompiled.java | 12 +- .../permission/PermissionPrecompiled.java | 12 +- .../sysconfig/SystemConfigPrecompiled.java | 12 +- .../decode/TransactionDecoderService.java | 28 ++--- .../encode/TransactionEncoderService.java | 12 +- .../manager/AssembleTransactionProcessor.java | 4 +- .../manager/TransactionProcessor.java | 8 +- .../java/org/fisco/bcos/sdk/BcosSDKTest.java | 4 +- .../bcos/sdk/eventsub/SubscribeTest.java | 12 +- .../bcos/sdk/precompiled/PrecompiledTest.java | 41 +++--- .../transaction/decoder/EventDecodeTest.java | 4 +- .../TransactionDecoderServiceTest.java | 4 +- .../AssembleTransactionProcessorTest.java | 16 +-- 58 files changed, 360 insertions(+), 402 deletions(-) rename sdk-abi/src/test/java/org/fisco/bcos/sdk/{ => test}/abi/ABICodecTest.java (99%) rename sdk-abi/src/test/java/org/fisco/bcos/sdk/{ => test}/abi/ABIDefinitionTest.java (100%) rename sdk-abi/src/test/java/org/fisco/bcos/sdk/{ => test}/abi/ABIEventTest.java (98%) rename sdk-abi/src/test/java/org/fisco/bcos/sdk/{ => test}/abi/ABIObjectCodecTest.java (100%) rename sdk-abi/src/test/java/org/fisco/bcos/sdk/{ => test}/abi/ABIObjectFactoryTest.java (98%) rename sdk-abi/src/test/java/org/fisco/bcos/sdk/{ => test}/abi/ABIObjectTest.java (100%) rename sdk-abi/src/test/java/org/fisco/bcos/sdk/{ => test}/abi/ContractTypeTest.java (100%) rename sdk-abi/src/test/java/org/fisco/bcos/sdk/{ => test}/abi/TableTest.java (98%) rename sdk-abi/src/test/java/org/fisco/bcos/sdk/{ => test}/abi/Utils.java (79%) rename sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/{CryptoInterface.java => CryptoSuite.java} (95%) diff --git a/.ci/ci_check_commit.sh b/.ci/ci_check_commit.sh index e8a1cc86c..2d9579de4 100644 --- a/.ci/ci_check_commit.sh +++ b/.ci/ci_check_commit.sh @@ -3,7 +3,7 @@ set -e scan_code_script="cobra/cobra.py -f json -o /tmp/report.json -t " -ignore_files=(sh crt key json toml SignatureTest.java Ok.java bin abi ChannelTest.java ParallelOkDemo.java PerformanceAmop.java DagPrecompiledDemo.java KeyToolTest.java CryptoInterface.java AmopMsgHandlerTest.java TopicManager.java PrivateTopicVerifyTest.java AmopMsgBuilder.java TopicManagerTest.java AmopSubscribe.java AmopPublisher.java AmopPublisherPrivate.java AmopSubscribePrivate.java AmopPublisherFile.java AmopPublisherPrivateFile.java DemoAmopCallback.java FileToByteArrayHelper.java OkD.java TableTest.java PerformanceTable.java HelloWorld.java PerformanceRPC.java CodecTest.java ResponseTest.java ConfigTest.java) +ignore_files=(sh crt key json toml SignatureTest.java Ok.java bin abi ChannelTest.java ParallelOkDemo.java PerformanceAmop.java DagPrecompiledDemo.java KeyToolTest.java CryptoSuite.java AmopMsgHandlerTest.java TopicManager.java PrivateTopicVerifyTest.java AmopMsgBuilder.java TopicManagerTest.java AmopSubscribe.java AmopPublisher.java AmopPublisherPrivate.java AmopSubscribePrivate.java AmopPublisherFile.java AmopPublisherPrivateFile.java DemoAmopCallback.java FileToByteArrayHelper.java OkD.java TableTest.java PerformanceTable.java HelloWorld.java PerformanceRPC.java CodecTest.java ResponseTest.java ConfigTest.java) commit_limit=6 LOG_ERROR() { diff --git a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/ABICodec.java b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/ABICodec.java index 8b2dd5b40..986ecd643 100644 --- a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/ABICodec.java +++ b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/ABICodec.java @@ -24,7 +24,7 @@ import org.fisco.bcos.sdk.abi.wrapper.ABIObject; import org.fisco.bcos.sdk.abi.wrapper.ABIObjectFactory; import org.fisco.bcos.sdk.abi.wrapper.ContractABIDefinition; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,20 +32,20 @@ public class ABICodec { private static final Logger logger = LoggerFactory.getLogger(ABICodec.class); - private final CryptoInterface cryptoInterface; + private final CryptoSuite cryptoSuite; public static final String TYPE_CONSTRUCTOR = "constructor"; private ABIDefinitionFactory abiDefinitionFactory; private final ABIObjectFactory abiObjectFactory = new ABIObjectFactory(); private final ABICodecJsonWrapper abiCodecJsonWrapper = new ABICodecJsonWrapper(); - public ABICodec(CryptoInterface cryptoInterface) { + public ABICodec(CryptoSuite cryptoSuite) { super(); - this.cryptoInterface = cryptoInterface; - abiDefinitionFactory = new ABIDefinitionFactory(cryptoInterface); + this.cryptoSuite = cryptoSuite; + abiDefinitionFactory = new ABIDefinitionFactory(cryptoSuite); } - public CryptoInterface getCryptoInterface() { - return cryptoInterface; + public CryptoSuite getCryptoSuite() { + return cryptoSuite; } public String encodeConstructor(String ABI, String BIN, List params) @@ -93,7 +93,7 @@ public String encodeMethod(String ABI, String methodName, List params) ABIObject inputABIObject = abiObjectFactory.createInputObject(abiDefinition); ABICodecObject abiCodecObject = new ABICodecObject(); try { - String methodId = abiDefinition.getMethodId(cryptoInterface); + String methodId = abiDefinition.getMethodId(cryptoSuite); return methodId + abiCodecObject.encodeValue(inputABIObject, params).encode(); } catch (Exception e) { logger.error(" exception in encodeMethodFromObject : {}", e.getMessage()); @@ -131,7 +131,7 @@ public String encodeMethodById(String ABI, String methodId, List params) public String encodeMethodByInterface(String ABI, String methodInterface, List params) throws ABICodecException { - FunctionEncoder functionEncoder = new FunctionEncoder(cryptoInterface); + FunctionEncoder functionEncoder = new FunctionEncoder(cryptoSuite); String methodId = functionEncoder.buildMethodId(methodInterface); return encodeMethodById(ABI, methodId, params); } @@ -156,7 +156,7 @@ public String encodeMethodFromString(String ABI, String methodName, List ABIObject inputABIObject = abiObjectFactory.createInputObject(abiDefinition); ABICodecJsonWrapper abiCodecJsonWrapper = new ABICodecJsonWrapper(); try { - String methodId = abiDefinition.getMethodId(cryptoInterface); + String methodId = abiDefinition.getMethodId(cryptoSuite); return methodId + abiCodecJsonWrapper.encode(inputABIObject, params).encode(); } catch (IOException e) { logger.error(" exception in encodeMethodFromString : {}", e.getMessage()); @@ -194,7 +194,7 @@ public String encodeMethodByIdFromString(String ABI, String methodId, List params) throws ABICodecException { - FunctionEncoder functionEncoder = new FunctionEncoder(cryptoInterface); + FunctionEncoder functionEncoder = new FunctionEncoder(cryptoSuite); String methodId = functionEncoder.buildMethodId(methodInterface); return encodeMethodByIdFromString(ABI, methodId, params); } @@ -256,7 +256,7 @@ public List decodeMethodById(String ABI, String methodId, String output) public List decodeMethodByInterface(String ABI, String methodInterface, String output) throws ABICodecException { - FunctionEncoder functionEncoder = new FunctionEncoder(cryptoInterface); + FunctionEncoder functionEncoder = new FunctionEncoder(cryptoSuite); String methodId = functionEncoder.buildMethodId(methodInterface); return decodeMethodById(ABI, methodId, output); } @@ -312,7 +312,7 @@ public List decodeMethodByIdToString(String ABI, String methodId, String public List decodeMethodByInterfaceToString( String ABI, String methodInterface, String output) throws ABICodecException { - FunctionEncoder functionEncoder = new FunctionEncoder(cryptoInterface); + FunctionEncoder functionEncoder = new FunctionEncoder(cryptoSuite); String methodId = functionEncoder.buildMethodId(methodInterface); return decodeMethodByIdToString(ABI, methodId, output); } @@ -364,7 +364,7 @@ public List decodeEventByTopic(String ABI, String eventTopic, String out public List decodeEventByInterface(String ABI, String eventSignature, String output) throws ABICodecException { - FunctionEncoder functionEncoder = new FunctionEncoder(cryptoInterface); + FunctionEncoder functionEncoder = new FunctionEncoder(cryptoSuite); String methodId = functionEncoder.buildMethodId(eventSignature); return decodeEventByTopic(ABI, methodId, output); } @@ -416,7 +416,7 @@ public List decodeEventByTopicToString(String ABI, String eventTopic, St public List decodeEventByInterfaceToString( String ABI, String eventSignature, String output) throws ABICodecException { - FunctionEncoder functionEncoder = new FunctionEncoder(cryptoInterface); + FunctionEncoder functionEncoder = new FunctionEncoder(cryptoSuite); String methodId = functionEncoder.buildMethodId(eventSignature); return decodeEventByTopicToString(ABI, methodId, output); } diff --git a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/EventEncoder.java b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/EventEncoder.java index e14d066b6..661abd7c0 100644 --- a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/EventEncoder.java +++ b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/EventEncoder.java @@ -4,7 +4,7 @@ import java.util.stream.Collectors; import org.fisco.bcos.sdk.abi.datatypes.Event; import org.fisco.bcos.sdk.abi.datatypes.Type; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.utils.Numeric; /** @@ -13,10 +13,10 @@ */ public class EventEncoder { - private CryptoInterface cryptoInterface; + private CryptoSuite cryptoSuite; - public EventEncoder(CryptoInterface cryptoInterface) { - this.cryptoInterface = cryptoInterface; + public EventEncoder(CryptoSuite cryptoSuite) { + this.cryptoSuite = cryptoSuite; } public String encode(Event event) { @@ -41,17 +41,17 @@ private String buildMethodSignature( public String buildEventSignature(String methodSignature) { byte[] input = methodSignature.getBytes(); - byte[] hash = cryptoInterface.hash(input); + byte[] hash = cryptoSuite.hash(input); return Numeric.toHexString(hash); } - /** @return the cryptoInterface */ - public CryptoInterface getCryptoInterface() { - return cryptoInterface; + /** @return the cryptoSuite */ + public CryptoSuite getCryptoSuite() { + return cryptoSuite; } - /** @param cryptoInterface the cryptoInterface to set */ - public void setCryptoInterface(CryptoInterface cryptoInterface) { - this.cryptoInterface = cryptoInterface; + /** @param cryptoSuite the cryptoSuite to set */ + public void setCryptoSuite(CryptoSuite cryptoSuite) { + this.cryptoSuite = cryptoSuite; } } diff --git a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/FunctionEncoder.java b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/FunctionEncoder.java index 88099830f..914442dcb 100644 --- a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/FunctionEncoder.java +++ b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/FunctionEncoder.java @@ -6,7 +6,7 @@ import org.fisco.bcos.sdk.abi.datatypes.Function; import org.fisco.bcos.sdk.abi.datatypes.Type; import org.fisco.bcos.sdk.abi.datatypes.Uint; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.utils.Numeric; /** @@ -15,10 +15,10 @@ */ public class FunctionEncoder { - private CryptoInterface cryptoInterface; + private CryptoSuite cryptoSuite; - public FunctionEncoder(CryptoInterface cryptoInterface) { - this.cryptoInterface = cryptoInterface; + public FunctionEncoder(CryptoSuite cryptoSuite) { + this.cryptoSuite = cryptoSuite; } public String encode(Function function) { @@ -72,17 +72,17 @@ public static String buildMethodSignature(String methodName, List paramete public String buildMethodId(String methodSignature) { byte[] input = methodSignature.getBytes(); - byte[] hash = cryptoInterface.hash(input); + byte[] hash = cryptoSuite.hash(input); return Numeric.toHexString(hash).substring(0, 10); } - /** @return the cryptoInterface */ - public CryptoInterface getCryptoInterface() { - return cryptoInterface; + /** @return the cryptoSuite */ + public CryptoSuite getCryptoSuite() { + return cryptoSuite; } - /** @param cryptoInterface the cryptoInterface to set */ - public void setCryptoInterface(CryptoInterface cryptoInterface) { - this.cryptoInterface = cryptoInterface; + /** @param cryptoSuite the cryptoSuite to set */ + public void setCryptoSuite(CryptoSuite cryptoSuite) { + this.cryptoSuite = cryptoSuite; } } diff --git a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/tools/TopicTools.java b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/tools/TopicTools.java index cb79f7448..65cad5535 100644 --- a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/tools/TopicTools.java +++ b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/tools/TopicTools.java @@ -3,7 +3,7 @@ import java.math.BigInteger; import org.fisco.bcos.sdk.abi.TypeEncoder; import org.fisco.bcos.sdk.abi.datatypes.Bytes; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.utils.AddressUtils; import org.fisco.bcos.sdk.utils.Numeric; @@ -12,10 +12,10 @@ public class TopicTools { public static final int MAX_NUM_TOPIC_EVENT_LOG = 4; public static final String LATEST = "latest"; - private CryptoInterface cryptoInterface; + private CryptoSuite cryptoSuite; - public TopicTools(CryptoInterface cryptoInterface) { - this.cryptoInterface = cryptoInterface; + public TopicTools(CryptoSuite cryptoSuite) { + this.cryptoSuite = cryptoSuite; } public String integerToTopic(BigInteger i) { @@ -39,12 +39,12 @@ public String addressToTopic(String s) { } public String stringToTopic(String s) { - byte[] hash = cryptoInterface.hash(s.getBytes()); + byte[] hash = cryptoSuite.hash(s.getBytes()); return Numeric.toHexString(hash); } public String bytesToTopic(byte[] b) { - byte[] hash = cryptoInterface.hash(b); + byte[] hash = cryptoSuite.hash(b); return Numeric.toHexString(hash); } diff --git a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinition.java b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinition.java index 7b7eeb73b..c20ad3666 100644 --- a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinition.java +++ b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinition.java @@ -8,7 +8,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import org.fisco.bcos.sdk.abi.FunctionEncoder; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; /** * ABIDefinition wrapper @@ -111,8 +111,8 @@ public String getMethodSignatureAsString() { * * @return the method id */ - public String getMethodId(CryptoInterface cryptoInterface) { - FunctionEncoder encoder = new FunctionEncoder(cryptoInterface); + public String getMethodId(CryptoSuite cryptoSuite) { + FunctionEncoder encoder = new FunctionEncoder(cryptoSuite); return encoder.buildMethodId(getMethodSignatureAsString()); } diff --git a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinitionFactory.java b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinitionFactory.java index 7ff1d7a29..e354d5ffe 100644 --- a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinitionFactory.java +++ b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinitionFactory.java @@ -1,6 +1,6 @@ package org.fisco.bcos.sdk.abi.wrapper; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.utils.ObjectMapperFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,10 +9,10 @@ public class ABIDefinitionFactory { private static final Logger logger = LoggerFactory.getLogger(ABIDefinitionFactory.class); - private CryptoInterface cryptoInterface; + private CryptoSuite cryptoSuite; - public ABIDefinitionFactory(CryptoInterface cryptoInterface) { - this.cryptoInterface = cryptoInterface; + public ABIDefinitionFactory(CryptoSuite cryptoSuite) { + this.cryptoSuite = cryptoSuite; } /** @@ -26,8 +26,7 @@ public ContractABIDefinition loadABI(String abi) { ABIDefinition[] abiDefinitions = ObjectMapperFactory.getObjectMapper().readValue(abi, ABIDefinition[].class); - ContractABIDefinition contractABIDefinition = - new ContractABIDefinition(cryptoInterface); + ContractABIDefinition contractABIDefinition = new ContractABIDefinition(cryptoSuite); for (ABIDefinition abiDefinition : abiDefinitions) { if (abiDefinition.getType().equals("constructor")) { contractABIDefinition.setConstructor(abiDefinition); diff --git a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ContractABIDefinition.java b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ContractABIDefinition.java index cbc3a13ff..0df6431cc 100644 --- a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ContractABIDefinition.java +++ b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ContractABIDefinition.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.utils.Numeric; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,10 +20,10 @@ public class ContractABIDefinition { private Map methodIDToFunctions = new HashMap<>(); // event topic => topic private Map eventTopicToEvents = new HashMap<>(); - private CryptoInterface cryptoInterface; + private CryptoSuite cryptoSuite; - public ContractABIDefinition(CryptoInterface cryptoInterface) { - this.cryptoInterface = cryptoInterface; + public ContractABIDefinition(CryptoSuite cryptoSuite) { + this.cryptoSuite = cryptoSuite; } public ABIDefinition getConstructor() { @@ -78,7 +78,7 @@ public void addFunction(String name, ABIDefinition abiDefinition) { abiDefinitions.add(abiDefinition); // calculate method id and add abiDefinition to methodIdToFunctions - String methodId = abiDefinition.getMethodId(cryptoInterface); + String methodId = abiDefinition.getMethodId(cryptoSuite); methodIDToFunctions.put(methodId, abiDefinition); logger.info( diff --git a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABICodecTest.java b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABICodecTest.java similarity index 99% rename from sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABICodecTest.java rename to sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABICodecTest.java index c25ea06a5..27b88e5b2 100644 --- a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABICodecTest.java +++ b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABICodecTest.java @@ -314,7 +314,7 @@ public void testEncodeFromString() { argsObjects.add(listParams); argsObjects.add("Hello world!"); - ABICodec abiCodec = new ABICodec(Utils.getCryptoInterface()); + ABICodec abiCodec = new ABICodec(Utils.getCryptoSuite()); try { // Method // encode @@ -336,11 +336,11 @@ public void testEncodeFromString() { Assert.assertEquals( encodedWithMethodId, abiCodec.encodeMethodByIdFromString( - abiDesc, test.getMethodId(Utils.getCryptoInterface()), args)); + abiDesc, test.getMethodId(Utils.getCryptoSuite()), args)); Assert.assertEquals( encodedWithMethodId, abiCodec.encodeMethodById( - abiDesc, test.getMethodId(Utils.getCryptoInterface()), abiObjects)); + abiDesc, test.getMethodId(Utils.getCryptoSuite()), abiObjects)); // MethodByInterface String & JavaObject Assert.assertEquals( encodedWithMethodId, diff --git a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIDefinitionTest.java b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIDefinitionTest.java similarity index 100% rename from sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIDefinitionTest.java rename to sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIDefinitionTest.java diff --git a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIEventTest.java b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIEventTest.java similarity index 98% rename from sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIEventTest.java rename to sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIEventTest.java index fdb5392bf..c9cd59f28 100644 --- a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIEventTest.java +++ b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIEventTest.java @@ -14,7 +14,7 @@ public class ABIEventTest { @Test public void testDecode() { - ABICodec abiCodec = new ABICodec(Utils.getCryptoInterface()); + ABICodec abiCodec = new ABICodec(Utils.getCryptoSuite()); try { List list = abiCodec.decodeEvent(abi, "LogSetValues", encoded); Assert.assertEquals(list.size(), 3); diff --git a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIObjectCodecTest.java b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIObjectCodecTest.java similarity index 100% rename from sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIObjectCodecTest.java rename to sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIObjectCodecTest.java diff --git a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIObjectFactoryTest.java b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIObjectFactoryTest.java similarity index 98% rename from sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIObjectFactoryTest.java rename to sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIObjectFactoryTest.java index 74bec602f..17723d015 100644 --- a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIObjectFactoryTest.java +++ b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIObjectFactoryTest.java @@ -8,7 +8,7 @@ import org.fisco.bcos.sdk.abi.wrapper.ABIObject; import org.fisco.bcos.sdk.abi.wrapper.ABIObjectFactory; import org.fisco.bcos.sdk.abi.wrapper.ContractABIDefinition; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.junit.Assert; import org.junit.Test; @@ -89,8 +89,8 @@ function h(S[4] memory, T[4] memory, E[4] memory, uint256[4] memory) public {} "[{\"constant\":false,\"inputs\":[{\"components\":[{\"internalType\":\"string\",\"name\":\"s\",\"type\":\"string\"}],\"internalType\":\"struct Test.E\",\"name\":\"e\",\"type\":\"tuple\"}],\"name\":\"a\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T\",\"name\":\"t\",\"type\":\"tuple\"}],\"name\":\"b\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T\",\"name\":\"t\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"s\",\"type\":\"string\"}],\"internalType\":\"struct Test.E\",\"name\":\"e\",\"type\":\"tuple\"}],\"name\":\"c\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"d\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"string[]\",\"name\":\"\",\"type\":\"string[]\"},{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"name\":\"e\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"a\",\"type\":\"uint256\"},{\"internalType\":\"uint256[]\",\"name\":\"b\",\"type\":\"uint256[]\"},{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T[]\",\"name\":\"c\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T\",\"name\":\"t\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"s\",\"type\":\"string\"}],\"internalType\":\"struct Test.E\",\"name\":\"e\",\"type\":\"tuple\"}],\"internalType\":\"struct Test.S\",\"name\":\"\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T\",\"name\":\"\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"s\",\"type\":\"string\"}],\"internalType\":\"struct Test.E\",\"name\":\"\",\"type\":\"tuple\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"f\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"pure\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"a\",\"type\":\"uint256\"},{\"internalType\":\"uint256[]\",\"name\":\"b\",\"type\":\"uint256[]\"},{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T[]\",\"name\":\"c\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T\",\"name\":\"t\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"s\",\"type\":\"string\"}],\"internalType\":\"struct Test.E\",\"name\":\"e\",\"type\":\"tuple\"}],\"internalType\":\"struct Test.S[]\",\"name\":\"\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T[]\",\"name\":\"\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"s\",\"type\":\"string\"}],\"internalType\":\"struct Test.E[]\",\"name\":\"\",\"type\":\"tuple[]\"},{\"internalType\":\"uint256[]\",\"name\":\"\",\"type\":\"uint256[]\"}],\"name\":\"g\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"pure\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"components\":[{\"internalType\":\"uint256\",\"name\":\"a\",\"type\":\"uint256\"},{\"internalType\":\"uint256[]\",\"name\":\"b\",\"type\":\"uint256[]\"},{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T[]\",\"name\":\"c\",\"type\":\"tuple[]\"},{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T\",\"name\":\"t\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"s\",\"type\":\"string\"}],\"internalType\":\"struct Test.E\",\"name\":\"e\",\"type\":\"tuple\"}],\"internalType\":\"struct Test.S[4]\",\"name\":\"\",\"type\":\"tuple[4]\"},{\"components\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"y\",\"type\":\"uint256\"}],\"internalType\":\"struct Test.T[4]\",\"name\":\"\",\"type\":\"tuple[4]\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"s\",\"type\":\"string\"}],\"internalType\":\"struct Test.E[4]\",\"name\":\"\",\"type\":\"tuple[4]\"},{\"internalType\":\"uint256[4]\",\"name\":\"\",\"type\":\"uint256[4]\"}],\"name\":\"h\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"pure\",\"type\":\"function\"}]"; ContractABIDefinition contractABIDefinition = Utils.getContractABIDefinition(abi); - CryptoInterface cryptoInterface = Utils.getCryptoInterface(); - FunctionEncoder functionEncoder = new FunctionEncoder(cryptoInterface); + CryptoSuite cryptoSuite = Utils.getCryptoSuite(); + FunctionEncoder functionEncoder = new FunctionEncoder(cryptoSuite); assertEquals( contractABIDefinition.getFunctions().get("a").get(0).getMethodSignatureAsString(), "a((string))"); @@ -179,7 +179,7 @@ function h(S[4] memory, T[4] memory, E[4] memory, uint256[4] memory) public {} .getFunctions() .get("g") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0xadc86690"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xadc86690"))); @@ -192,7 +192,7 @@ function h(S[4] memory, T[4] memory, E[4] memory, uint256[4] memory) public {} .getFunctions() .get("h") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x7a3093eb"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xadc86690"))); } @@ -346,7 +346,7 @@ function test_empty() public returns(int a, Info[][] memory b, string memory c) .getFunctions() .get("test") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x00a3c75d"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x00a3c75d"))); @@ -363,7 +363,7 @@ function test_empty() public returns(int a, Info[][] memory b, string memory c) .getFunctions() .get("test1") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x6b59084d"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x6b59084d"))); } @@ -643,7 +643,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("addPath") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0xe1207bee"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xe1207bee"))); @@ -660,7 +660,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("commitTransaction") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x063ff7ef"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x063ff7ef"))); @@ -677,7 +677,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("constantCall") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0xb54138b0"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xb54138b0"))); @@ -694,7 +694,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("deletePathList") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0xf4fa9d03"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xf4fa9d03"))); @@ -711,7 +711,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("getLatestTransaction") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x6ccc29dc"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x6ccc29dc"))); @@ -728,7 +728,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("getLatestTransactionInfo") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x9edd3441"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x9edd3441"))); @@ -745,7 +745,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("getMaxStep") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0xcb797d2f"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xcb797d2f"))); @@ -762,7 +762,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("getPaths") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x4efcaed0"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x4efcaed0"))); @@ -779,7 +779,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("getTransactionInfo") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0xd55c01f7"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xd55c01f7"))); @@ -796,7 +796,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("getVersion") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x8bc4827c"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x8bc4827c"))); @@ -813,7 +813,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("rollbackAndDeleteTransaction") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x8c31f9ad"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x8c31f9ad"))); @@ -830,7 +830,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("sendTransaction") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x772d0b53"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x772d0b53"))); @@ -847,7 +847,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("rollbackTransaction") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x51cd3824"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x51cd3824"))); @@ -864,7 +864,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("setMaxStep") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x18a56b67"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x18a56b67"))); @@ -881,7 +881,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("startTransaction") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0xe25a0866"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xe25a0866"))); @@ -898,7 +898,7 @@ function stringToUint256(string memory _str) public pure .getFunctions() .get("stringToUint256") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0xac5d3723"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xac5d3723"))); } @@ -1198,7 +1198,7 @@ function test2(uint256[4] _u,int256[4] _i,bool[4] _b,address[4] _addr,bytes32[4] .getFunctions() .get("test0") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0xf92a5e47"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0xf92a5e47"))); @@ -1215,7 +1215,7 @@ function test2(uint256[4] _u,int256[4] _i,bool[4] _b,address[4] _addr,bytes32[4] .getFunctions() .get("test2") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x10c7e4ab"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x10c7e4ab"))); @@ -1232,7 +1232,7 @@ function test2(uint256[4] _u,int256[4] _i,bool[4] _b,address[4] _addr,bytes32[4] .getFunctions() .get("test1") .get(0) - .getMethodId(Utils.getCryptoInterface()), + .getMethodId(Utils.getCryptoSuite()), "0x70be28d9"); assertTrue(Objects.nonNull(contractABIDefinition.getABIDefinitionByMethodId("0x70be28d9"))); } diff --git a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIObjectTest.java b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIObjectTest.java similarity index 100% rename from sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ABIObjectTest.java rename to sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ABIObjectTest.java diff --git a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ContractTypeTest.java b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ContractTypeTest.java similarity index 100% rename from sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/ContractTypeTest.java rename to sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/ContractTypeTest.java diff --git a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/TableTest.java b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/TableTest.java similarity index 98% rename from sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/TableTest.java rename to sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/TableTest.java index cb688f477..41c637e86 100644 --- a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/TableTest.java +++ b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/TableTest.java @@ -155,10 +155,10 @@ public void ABILoadTest() { ABIDefinition remove = contractABIDefinition.getFunctions().get("remove").get(0); ABIDefinition select = contractABIDefinition.getFunctions().get("select").get(0); - Assert.assertEquals(insert.getMethodId(Utils.getCryptoInterface()), "0xebf3b24f"); - Assert.assertEquals(remove.getMethodId(Utils.getCryptoInterface()), "0xc4f41ab3"); - Assert.assertEquals(update.getMethodId(Utils.getCryptoInterface()), "0x487a5a10"); - Assert.assertEquals(select.getMethodId(Utils.getCryptoInterface()), "0xfcd7e3c1"); + Assert.assertEquals(insert.getMethodId(Utils.getCryptoSuite()), "0xebf3b24f"); + Assert.assertEquals(remove.getMethodId(Utils.getCryptoSuite()), "0xc4f41ab3"); + Assert.assertEquals(update.getMethodId(Utils.getCryptoSuite()), "0x487a5a10"); + Assert.assertEquals(select.getMethodId(Utils.getCryptoSuite()), "0xfcd7e3c1"); Assert.assertEquals(insert.getMethodSignatureAsString(), "insert(string,int256,string)"); Assert.assertEquals(remove.getMethodSignatureAsString(), "remove(string,int256)"); diff --git a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/Utils.java b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/Utils.java similarity index 79% rename from sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/Utils.java rename to sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/Utils.java index 21ae04fa1..a3ca3be57 100644 --- a/sdk-abi/src/test/java/org/fisco/bcos/sdk/abi/Utils.java +++ b/sdk-abi/src/test/java/org/fisco/bcos/sdk/test/abi/Utils.java @@ -17,18 +17,18 @@ import org.fisco.bcos.sdk.abi.wrapper.ABIDefinitionFactory; import org.fisco.bcos.sdk.abi.wrapper.ContractABIDefinition; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.model.CryptoType; public class Utils { - public static CryptoInterface getCryptoInterface() { - return new CryptoInterface(CryptoType.ECDSA_TYPE); + public static CryptoSuite getCryptoSuite() { + return new CryptoSuite(CryptoType.ECDSA_TYPE); } public static ContractABIDefinition getContractABIDefinition(String abiDesc) { - CryptoInterface cryptoInterface = getCryptoInterface(); - ABIDefinitionFactory abiDefinitionFactory = new ABIDefinitionFactory(cryptoInterface); + CryptoSuite cryptoSuite = getCryptoSuite(); + ABIDefinitionFactory abiDefinitionFactory = new ABIDefinitionFactory(cryptoSuite); return abiDefinitionFactory.loadABI(abiDesc); } } diff --git a/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java b/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java index e31251dd6..faa6bc6f5 100644 --- a/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java +++ b/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java @@ -31,7 +31,7 @@ import org.fisco.bcos.sdk.channel.Channel; import org.fisco.bcos.sdk.channel.ResponseCallback; import org.fisco.bcos.sdk.channel.model.Options; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keystore.KeyTool; import org.fisco.bcos.sdk.model.AmopMsg; import org.fisco.bcos.sdk.model.CryptoType; @@ -220,10 +220,10 @@ public int checkSignature(String topic, byte[] randomValue, byte[] signature) { Iterator pks = pubKeys.iterator(); while (pks.hasNext()) { KeyTool keyTool = pks.next(); - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); - if (cryptoInterface.verify( + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.ECDSA_TYPE); + if (cryptoSuite.verify( keyTool, - Hex.toHexString(cryptoInterface.hash(randomValue)), + Hex.toHexString(cryptoSuite.hash(randomValue)), Hex.toHexString(signature))) { return 0; } @@ -256,11 +256,9 @@ public void onPrivateTopicRandomValue(ChannelHandlerContext ctx, AmopMsg msg) { logger.error("topic:{} not subscribed, reject message", getSimpleTopic(topic)); return; } else { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.ECDSA_TYPE); try { - signature = - cryptoInterface.sign( - keyTool, Hex.toHexString(cryptoInterface.hash(randValue))); + signature = cryptoSuite.sign(keyTool, Hex.toHexString(cryptoSuite.hash(randValue))); } catch (Exception e) { logger.error( "please check the public key of topic {} is correct configured, error {}", diff --git a/sdk-amop/src/test/java/org/fisco/bcos/sdk/amop/AmopMsgHandlerTest.java b/sdk-amop/src/test/java/org/fisco/bcos/sdk/amop/AmopMsgHandlerTest.java index 413a43fbe..b5071449b 100644 --- a/sdk-amop/src/test/java/org/fisco/bcos/sdk/amop/AmopMsgHandlerTest.java +++ b/sdk-amop/src/test/java/org/fisco/bcos/sdk/amop/AmopMsgHandlerTest.java @@ -8,7 +8,7 @@ import org.fisco.bcos.sdk.amop.topic.RequestVerifyData; import org.fisco.bcos.sdk.amop.topic.TopicManager; import org.fisco.bcos.sdk.channel.ResponseCallback; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keystore.KeyTool; import org.fisco.bcos.sdk.crypto.keystore.P12KeyStore; import org.fisco.bcos.sdk.crypto.keystore.PEMKeyStore; @@ -93,7 +93,7 @@ public void testSignRandom() throws JsonProcessingException { AmopMsg amopMsg = new AmopMsg(signedRandom); amopMsg.decodeAmopBody(signedRandom.getData()); - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.ECDSA_TYPE); Assert.assertTrue(amopMsg.getType() == (short) MsgType.AMOP_RESPONSE.getType()); Assert.assertEquals( "#!$VerifyChannel_#!$TopicNeedVerify_priv1_5e14c53197adbcb719d915fb93342c25", @@ -106,9 +106,9 @@ public void testSignRandom() throws JsonProcessingException { .getPath(); KeyTool km = new PEMKeyStore(keyFile); Assert.assertTrue( - cryptoInterface.verify( + cryptoSuite.verify( km, - Hex.toHexString(cryptoInterface.hash(randomValue)), + Hex.toHexString(cryptoSuite.hash(randomValue)), Hex.toHexString(amopMsg.getData()))); } diff --git a/sdk-codegen/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java b/sdk-codegen/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java index 8d63c5646..f344d465b 100644 --- a/sdk-codegen/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java +++ b/sdk-codegen/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java @@ -55,7 +55,7 @@ import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.codegen.exceptions.CodeGenException; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.eventsub.EventCallback; import org.fisco.bcos.sdk.model.CryptoType; @@ -85,7 +85,7 @@ public class SolidityContractWrapper { private static final String GET_BINARY_FUNC = "getBinary"; private static final String CLIENT = "client"; private static final String CREDENTIAL = "credential"; - private static final String CRYPTOINTERFACE = "cryptoInterface"; + private static final String CRYPTOSUITE = "cryptoSuite"; private static final String CONTRACT_ADDRESS = "contractAddress"; private static final String FROM_BLOCK = "fromBlock"; private static final String TO_BLOCK = "toBlock"; @@ -121,7 +121,7 @@ public void generateJavaFiles( TypeSpec.Builder classBuilder = createClassBuilder(className, bin, smBin, abi); classBuilder.addMethod( - buildGetBinaryMethod(CryptoInterface.class, CryptoType.class, CRYPTOINTERFACE)); + buildGetBinaryMethod(CryptoSuite.class, CryptoType.class, CRYPTOSUITE)); classBuilder.addMethod(buildConstructor(CryptoKeyPair.class, CREDENTIAL)); classBuilder.addFields(buildFuncNameConstants(abiDefinitions)); @@ -1418,6 +1418,6 @@ public boolean isIndexed() { } private static String getBinaryFuncDefinition() { - return GET_BINARY_FUNC + "(client.getCryptoInterface())"; + return GET_BINARY_FUNC + "(client.getCryptoSuite())"; } } diff --git a/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/CryptoInterface.java b/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/CryptoSuite.java similarity index 95% rename from sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/CryptoInterface.java rename to sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/CryptoSuite.java index 864e0885b..5b3d40635 100644 --- a/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/CryptoInterface.java +++ b/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/CryptoSuite.java @@ -35,9 +35,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CryptoInterface { +public class CryptoSuite { - private static Logger logger = LoggerFactory.getLogger(CryptoInterface.class); + private static Logger logger = LoggerFactory.getLogger(CryptoSuite.class); public final int cryptoTypeConfig; @@ -47,9 +47,9 @@ public class CryptoInterface { private CryptoKeyPair cryptoKeyPair; private ConfigOption config; - public CryptoInterface(int cryptoTypeConfig, ConfigOption configOption) { + public CryptoSuite(int cryptoTypeConfig, ConfigOption configOption) { this(cryptoTypeConfig); - logger.info("init CryptoInterface, cryptoType: {}", cryptoTypeConfig); + logger.info("init CryptoSuite, cryptoType: {}", cryptoTypeConfig); setConfig(configOption); // doesn't set the account name, generate the keyPair randomly if (!configOption.getAccountConfig().isAccountConfigured()) { @@ -59,11 +59,11 @@ public CryptoInterface(int cryptoTypeConfig, ConfigOption configOption) { loadAccount(configOption); } /** - * init the common crypto implementation accordign to the crypto type + * init the common crypto implementation according to the crypto type * * @param cryptoTypeConfig */ - public CryptoInterface(int cryptoTypeConfig) { + public CryptoSuite(int cryptoTypeConfig) { this.cryptoTypeConfig = cryptoTypeConfig; if (this.cryptoTypeConfig == CryptoType.ECDSA_TYPE) { this.signatureImpl = new ECDSASignature(); diff --git a/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/exceptions/UnsupportedCryptoTypeException.java b/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/exceptions/UnsupportedCryptoTypeException.java index c52382fdd..c41f9b103 100644 --- a/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/exceptions/UnsupportedCryptoTypeException.java +++ b/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/exceptions/UnsupportedCryptoTypeException.java @@ -13,7 +13,7 @@ */ package org.fisco.bcos.sdk.crypto.exceptions; -/** Exceptioned when calling CryptoInterface. */ +/** Exceptioned when calling CryptoSuite. */ public class UnsupportedCryptoTypeException extends RuntimeException { public UnsupportedCryptoTypeException(String message) { super(message); diff --git a/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/HashTest.java b/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/HashTest.java index 9587ec7d9..664410890 100644 --- a/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/HashTest.java +++ b/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/HashTest.java @@ -13,7 +13,6 @@ */ package org.fisco.bcos.sdk.crypto; -import org.fisco.bcos.sdk.crypto.CryptoInterface; import org.fisco.bcos.sdk.crypto.exceptions.UnsupportedCryptoTypeException; import org.fisco.bcos.sdk.crypto.hash.Hash; import org.fisco.bcos.sdk.crypto.hash.Keccak256; @@ -25,52 +24,52 @@ public class HashTest { @Test - public void testCryptoInterfaceForSMHash() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.SM_TYPE); + public void testCryptoSuiteForSMHash() { + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.SM_TYPE); // check sm3 hash for "abcde" - checkHashWithCryptoInterface( - cryptoInterface, + checkHashWithCryptoSuite( + cryptoSuite, "abcde", "afe4ccac5ab7d52bcae36373676215368baf52d3905e1fecbe369cc120e97628"); // check sm3 hash for "hello" - checkHashWithCryptoInterface( - cryptoInterface, + checkHashWithCryptoSuite( + cryptoSuite, "hello", "becbbfaae6548b8bf0cfcad5a27183cd1be6093b1cceccc303d9c61d0a645268"); // check sm3 hash for empty string - checkHashWithCryptoInterface( - cryptoInterface, + checkHashWithCryptoSuite( + cryptoSuite, "", "1ab21d8355cfa17f8e61194831e81a8f22bec8c728fefb747ed035eb5082aa2b"); } @Test - public void testCryptoInterfaceForKeccak256Hash() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); + public void testCryptoSuiteForKeccak256Hash() { + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.ECDSA_TYPE); // check keccak256 for "abcde" - checkHashWithCryptoInterface( - cryptoInterface, + checkHashWithCryptoSuite( + cryptoSuite, "abcde", "6377c7e66081cb65e473c1b95db5195a27d04a7108b468890224bedbe1a8a6eb"); // check keccak256 for "hello" - checkHashWithCryptoInterface( - cryptoInterface, + checkHashWithCryptoSuite( + cryptoSuite, "hello", "1c8aff950685c2ed4bc3174f3472287b56d9517b9c948127319a09a7a36deac8"); // check keccak256 for empty string - checkHashWithCryptoInterface( - cryptoInterface, + checkHashWithCryptoSuite( + cryptoSuite, "", "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"); } @Test(expected = UnsupportedCryptoTypeException.class) public void testUnsupportedCryptoType() { - CryptoInterface cryptoInterface = new CryptoInterface(3); + new CryptoSuite(3); } @Test @@ -127,11 +126,11 @@ private void checkHash(Hash hasher, String message, String expectedHash) { Assert.assertEquals(true, Hex.toHexString(calculatedHashBytes).equals(expectedHash)); } - private void checkHashWithCryptoInterface( - CryptoInterface cryptoInterface, String message, String expectedHash) { - String calculatedHash = cryptoInterface.hash(message); + private void checkHashWithCryptoSuite( + CryptoSuite cryptoSuite, String message, String expectedHash) { + String calculatedHash = cryptoSuite.hash(message); Assert.assertEquals(true, calculatedHash.equals(expectedHash)); - byte[] calculatedHashBytes = cryptoInterface.hash(message.getBytes()); + byte[] calculatedHashBytes = cryptoSuite.hash(message.getBytes()); Assert.assertEquals(true, Hex.toHexString(calculatedHashBytes).equals(expectedHash)); } } diff --git a/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/KeyToolTest.java b/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/KeyToolTest.java index 7b4ed5e40..404fe67b5 100644 --- a/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/KeyToolTest.java +++ b/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/KeyToolTest.java @@ -168,13 +168,13 @@ private CryptoKeyPair testLoadP12File( } private CryptoKeyPair testSignature(KeyPair keyPair, int cryptoType, String expectedAccount) { - CryptoInterface cryptoInterface = new CryptoInterface(cryptoType); - CryptoKeyPair cryptoKeyPair = cryptoInterface.createKeyPair(keyPair); + CryptoSuite cryptoSuite = new CryptoSuite(cryptoType); + CryptoKeyPair cryptoKeyPair = cryptoSuite.createKeyPair(keyPair); // check account Assert.assertEquals(expectedAccount, cryptoKeyPair.getAddress()); // test signature SignatureTest signatureTest = new SignatureTest(); - signatureTest.testSignature(cryptoInterface, cryptoKeyPair); + signatureTest.testSignature(cryptoSuite, cryptoKeyPair); return cryptoKeyPair; } } diff --git a/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/SignatureTest.java b/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/SignatureTest.java index 9653f95c9..f8500162b 100644 --- a/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/SignatureTest.java +++ b/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/SignatureTest.java @@ -45,12 +45,12 @@ public class SignatureTest { .getPath(); @Test - public void testCryptoInterfaceForECDSA() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); + public void testCryptoSuiteForECDSA() { + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.ECDSA_TYPE); // generate keyPair - CryptoKeyPair keyPair = cryptoInterface.createKeyPair(); + CryptoKeyPair keyPair = cryptoSuite.createKeyPair(); // test signature - testSignature(cryptoInterface, keyPair); + testSignature(cryptoSuite, keyPair); // load KeyPair from the given privateKey String privateKeyStr = @@ -59,21 +59,21 @@ public void testCryptoInterfaceForECDSA() { "2179819159336280954262570523402774481036769289289277534998346117714415641803934346338726829054711133487295949018624582253372411779380507548447040213240521"; String hexedPublicKey = new BigInteger(publicKeyStr).toString(16); BigInteger privateKey = new BigInteger(privateKeyStr); - keyPair = cryptoInterface.getKeyPairFactory().createKeyPair(privateKey); + keyPair = cryptoSuite.getKeyPairFactory().createKeyPair(privateKey); // check publicKey System.out.println("hexedPublicKey: " + hexedPublicKey); System.out.println("keyPair.getHexPublicKey(): " + keyPair.getHexPublicKey()); Assert.assertEquals(hexedPublicKey, keyPair.getHexPublicKey().substring(2)); - testSignature(cryptoInterface, keyPair); + testSignature(cryptoSuite, keyPair); } @Test - public void testCryptoInterfaceForSM2() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.SM_TYPE); + public void testCryptoSuiteForSM2() { + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.SM_TYPE); // generate keyPair - CryptoKeyPair keyPair = cryptoInterface.createKeyPair(); + CryptoKeyPair keyPair = cryptoSuite.createKeyPair(); // test signature - testSignature(cryptoInterface, keyPair); + testSignature(cryptoSuite, keyPair); } @Test @@ -104,9 +104,9 @@ public void testValidGetAddressForECDSA() { testValidGetAddressForKeyPair( keyPair, hexPublicKey, expectedHash, hexPublicKey2, expectedHash2); - // create keyPair with cryptoInterface - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); - keyPair = cryptoInterface.createKeyPair(); + // create keyPair with cryptoSuite + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.ECDSA_TYPE); + keyPair = cryptoSuite.createKeyPair(); testValidGetAddressForKeyPair( keyPair, hexPublicKey, expectedHash, hexPublicKey2, expectedHash2); @@ -126,9 +126,9 @@ public void testValidGetAddressForSM() { testValidGetAddressForKeyPair( keyPair, hexPublicKey, expectedHash, hexPublicKey2, expectedHash2); - // create keyPair with cryptoInterface - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.SM_TYPE); - keyPair = cryptoInterface.createKeyPair(); + // create keyPair with cryptoSuite + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.SM_TYPE); + keyPair = cryptoSuite.createKeyPair(); testValidGetAddressForKeyPair( keyPair, hexPublicKey, expectedHash, hexPublicKey2, expectedHash2); @@ -192,16 +192,16 @@ public void testInvalidCaseForECDSAKeyPair() { } @Test(expected = KeyPairException.class) - public void testInvalidCaseForECDSACryptoInterface() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); - CryptoKeyPair keyPair = cryptoInterface.createKeyPair(); + public void testInvalidCaseForECDSACryptoSuite() { + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.ECDSA_TYPE); + CryptoKeyPair keyPair = cryptoSuite.createKeyPair(); testInvalidPublicKey(keyPair); } @Test(expected = KeyPairException.class) - public void testInvalidCaseForSM2CryptoInterface() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.SM_TYPE); - CryptoKeyPair keyPair = cryptoInterface.createKeyPair(); + public void testInvalidCaseForSM2CryptoSuite() { + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.SM_TYPE); + CryptoKeyPair keyPair = cryptoSuite.createKeyPair(); testInvalidPublicKey(keyPair); } @@ -251,7 +251,7 @@ public void testSignature(Hash hasher, Signature signature, CryptoKeyPair keyPai } } - public void testSignature(CryptoInterface signature, CryptoKeyPair keyPair) { + public void testSignature(CryptoSuite signature, CryptoKeyPair keyPair) { String message = "abcde"; // check valid case for (int i = 0; i < 10; i++) { @@ -303,24 +303,24 @@ public void testSignAndVerifyWithKeyManager() { KeyTool signKeyTool = new P12KeyStore( getClass().getClassLoader().getResource(keyPairPem).getPath(), "123456"); - CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); + CryptoSuite cryptoSuite = new CryptoSuite(CryptoType.ECDSA_TYPE); // sign and verify message with keyManager for (int i = 0; i < 10; i++) { - String message = cryptoInterface.hash("abcd----" + Integer.toString(i)); - String signature = cryptoInterface.sign(signKeyTool, message); - Assert.assertTrue(cryptoInterface.verify(verifykeyTool, message, signature)); - String invalidMessage = cryptoInterface.hash("abcde----" + Integer.toString(i)); - Assert.assertTrue(!cryptoInterface.verify(verifykeyTool, invalidMessage, signature)); + String message = cryptoSuite.hash("abcd----" + Integer.toString(i)); + String signature = cryptoSuite.sign(signKeyTool, message); + Assert.assertTrue(cryptoSuite.verify(verifykeyTool, message, signature)); + String invalidMessage = cryptoSuite.hash("abcde----" + Integer.toString(i)); + Assert.assertTrue(!cryptoSuite.verify(verifykeyTool, invalidMessage, signature)); } } public String getKeyStoreFilePath( - CryptoInterface cryptoInterface, ConfigOption configOption, String postFix) { + CryptoSuite cryptoSuite, ConfigOption configOption, String postFix) { return configOption.getAccountConfig().getKeyStoreDir() + File.separator - + cryptoInterface.getCryptoKeyPair().getKeyStoreSubDir() + + cryptoSuite.getCryptoKeyPair().getKeyStoreSubDir() + File.separator - + cryptoInterface.getCryptoKeyPair().getAddress() + + cryptoSuite.getCryptoKeyPair().getAddress() + postFix; } @@ -346,17 +346,17 @@ public void testECDSALoadAndStoreKeyPairWithP12() throws ConfigException { public void testLoadAndStoreKeyPairWithPEM(int cryptoType) throws ConfigException { ConfigOption configOption = Config.load(configFile, CryptoType.ECDSA_TYPE); - CryptoInterface cryptoInterface = new CryptoInterface(cryptoType); - cryptoInterface.getCryptoKeyPair().setConfig(configOption); - cryptoInterface.getCryptoKeyPair().storeKeyPairWithPemFormat(); - CryptoKeyPair orgKeyPair = cryptoInterface.getCryptoKeyPair(); + CryptoSuite cryptoSuite = new CryptoSuite(cryptoType); + cryptoSuite.getCryptoKeyPair().setConfig(configOption); + cryptoSuite.getCryptoKeyPair().storeKeyPairWithPemFormat(); + CryptoKeyPair orgKeyPair = cryptoSuite.getCryptoKeyPair(); // get pem file path String pemFilePath = - getKeyStoreFilePath(cryptoInterface, configOption, CryptoKeyPair.PEM_FILE_POSTFIX); + getKeyStoreFilePath(cryptoSuite, configOption, CryptoKeyPair.PEM_FILE_POSTFIX); // load pem file KeyTool pemManager = new PEMKeyStore(pemFilePath); - CryptoKeyPair decodedCryptoKeyPair = cryptoInterface.createKeyPair(pemManager.getKeyPair()); + CryptoKeyPair decodedCryptoKeyPair = cryptoSuite.createKeyPair(pemManager.getKeyPair()); System.out.println("PEM orgKeyPair pub: " + orgKeyPair.getHexPublicKey()); System.out.println("PEM decodedKeyPair pub: " + decodedCryptoKeyPair.getHexPublicKey()); @@ -369,23 +369,23 @@ public void testLoadAndStoreKeyPairWithPEM(int cryptoType) throws ConfigExceptio KeyTool verifyKeyTool = new PEMKeyStore(publicPemPath); checkSignAndVerifyWithKeyManager( - pemManager, decodedCryptoKeyPair, verifyKeyTool, cryptoInterface); + pemManager, decodedCryptoKeyPair, verifyKeyTool, cryptoSuite); } public void testLoadAndStoreKeyPairWithP12(int cryptoType) throws ConfigException { ConfigOption configOption = Config.load(configFile, CryptoType.ECDSA_TYPE); - CryptoInterface cryptoInterface = new CryptoInterface(cryptoType); - cryptoInterface.getCryptoKeyPair().setConfig(configOption); + CryptoSuite cryptoSuite = new CryptoSuite(cryptoType); + cryptoSuite.getCryptoKeyPair().setConfig(configOption); String password = "123"; - cryptoInterface.getCryptoKeyPair().storeKeyPairWithP12Format(password); - CryptoKeyPair orgKeyPair = cryptoInterface.getCryptoKeyPair(); + cryptoSuite.getCryptoKeyPair().storeKeyPairWithP12Format(password); + CryptoKeyPair orgKeyPair = cryptoSuite.getCryptoKeyPair(); // get p12 file path String p12FilePath = - getKeyStoreFilePath(cryptoInterface, configOption, CryptoKeyPair.P12_FILE_POSTFIX); + getKeyStoreFilePath(cryptoSuite, configOption, CryptoKeyPair.P12_FILE_POSTFIX); // load p12 file KeyTool p12Manager = new P12KeyStore(p12FilePath, password); - CryptoKeyPair decodedCryptoKeyPair = cryptoInterface.createKeyPair(p12Manager.getKeyPair()); + CryptoKeyPair decodedCryptoKeyPair = cryptoSuite.createKeyPair(p12Manager.getKeyPair()); // check the keyPair System.out.println("P12 orgKeyPair pub: " + orgKeyPair.getHexPublicKey()); System.out.println("P12 decodedKeyPair pub: " + decodedCryptoKeyPair.getHexPublicKey()); @@ -402,44 +402,44 @@ public void testLoadAndStoreKeyPairWithP12(int cryptoType) throws ConfigExceptio String publicP12Path = p12FilePath + ".pub"; KeyTool verifyKeyTool = new PEMKeyStore(publicP12Path); checkSignAndVerifyWithKeyManager( - p12Manager, decodedCryptoKeyPair, verifyKeyTool, cryptoInterface); + p12Manager, decodedCryptoKeyPair, verifyKeyTool, cryptoSuite); } private void checkSignAndVerifyWithKeyManager( KeyTool pemManager, CryptoKeyPair cryptoKeyPair, KeyTool verifyKeyTool, - CryptoInterface cryptoInterface) { + CryptoSuite cryptoSuite) { // sign and verify message with cryptoKeyPair for (int i = 0; i < 10; i++) { - String message = cryptoInterface.hash("abcd----" + Integer.toString(i)); - SignatureResult signature = cryptoInterface.sign(message, cryptoKeyPair); + String message = cryptoSuite.hash("abcd----" + Integer.toString(i)); + SignatureResult signature = cryptoSuite.sign(message, cryptoKeyPair); Assert.assertTrue( - cryptoInterface.verify( + cryptoSuite.verify( cryptoKeyPair.getHexPublicKey(), message, signature.convertToString())); Assert.assertTrue( - cryptoInterface.verify( + cryptoSuite.verify( cryptoKeyPair.getHexPublicKey(), Hex.decode(message), Hex.decode(signature.convertToString()))); - String invalidMessage = cryptoInterface.hash("abcde----" + Integer.toString(i)); + String invalidMessage = cryptoSuite.hash("abcde----" + Integer.toString(i)); Assert.assertTrue( - !cryptoInterface.verify( + !cryptoSuite.verify( cryptoKeyPair.getHexPublicKey(), invalidMessage, signature.convertToString())); } for (int i = 0; i < 10; i++) { - String message = cryptoInterface.hash("abcd----" + Integer.toString(i)); - String signature = cryptoInterface.sign(pemManager, message); - Assert.assertTrue(cryptoInterface.verify(verifyKeyTool, message, signature)); + String message = cryptoSuite.hash("abcd----" + Integer.toString(i)); + String signature = cryptoSuite.sign(pemManager, message); + Assert.assertTrue(cryptoSuite.verify(verifyKeyTool, message, signature)); Assert.assertTrue( - cryptoInterface.verify( + cryptoSuite.verify( verifyKeyTool, Hex.decode(message), Hex.decode(signature))); - String invalidMessage = cryptoInterface.hash("abcde----" + Integer.toString(i)); - Assert.assertTrue(!cryptoInterface.verify(verifyKeyTool, invalidMessage, signature)); + String invalidMessage = cryptoSuite.hash("abcde----" + Integer.toString(i)); + Assert.assertTrue(!cryptoSuite.verify(verifyKeyTool, invalidMessage, signature)); } } } diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java index 195dc8ec5..fccf250b8 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java @@ -15,7 +15,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple3; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -49,13 +49,11 @@ public class DagTransfer extends Contract { public static final String FUNC_USERDRAW = "userDraw"; protected DagTransfer(String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt userTransfer(String user_a, String user_b, BigInteger amount) { @@ -319,6 +317,6 @@ public static DagTransfer load( public static DagTransfer deploy(Client client, CryptoKeyPair credential) throws ContractException { return deploy( - DagTransfer.class, client, credential, getBinary(client.getCryptoInterface()), ""); + DagTransfer.class, client, credential, getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java index f8e0a2a92..8dce787d4 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java @@ -11,7 +11,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple1; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -43,13 +43,11 @@ public class HelloWorld extends Contract { public static final String FUNC_GET = "get"; protected HelloWorld(String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt set(String n) { @@ -105,7 +103,6 @@ public static HelloWorld load(String contractAddress, Client client, CryptoKeyPa public static HelloWorld deploy(Client client, CryptoKeyPair credential) throws ContractException { - return deploy( - HelloWorld.class, client, credential, getBinary(client.getCryptoInterface()), ""); + return deploy(HelloWorld.class, client, credential, getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/Ok.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/Ok.java index f9493283d..c37257e4d 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/Ok.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/Ok.java @@ -14,7 +14,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple1; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.eventsub.EventCallback; import org.fisco.bcos.sdk.model.CryptoType; @@ -52,13 +52,11 @@ public class Ok extends Contract { Arrays.>asList(new TypeReference() {}));; protected Ok(String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt trans(BigInteger num) { @@ -142,7 +140,7 @@ public static Ok load(String contractAddress, Client client, CryptoKeyPair crede } public static Ok deploy(Client client, CryptoKeyPair credential) throws ContractException { - return deploy(Ok.class, client, credential, getBinary(client.getCryptoInterface()), ""); + return deploy(Ok.class, client, credential, getBinary(client.getCryptoSuite()), ""); } public static class TransEventEventResponse { diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/OkD.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/OkD.java index a1fc7d114..864bb7aab 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/OkD.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/OkD.java @@ -15,7 +15,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple2; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.eventsub.EventCallback; import org.fisco.bcos.sdk.model.CryptoType; @@ -53,13 +53,11 @@ public class OkD extends Contract { Arrays.>asList(new TypeReference() {}));; protected OkD(String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public BigInteger get() throws ContractException { @@ -149,7 +147,7 @@ public static OkD load(String contractAddress, Client client, CryptoKeyPair cred } public static OkD deploy(Client client, CryptoKeyPair credential) throws ContractException { - return deploy(OkD.class, client, credential, getBinary(client.getCryptoInterface()), ""); + return deploy(OkD.class, client, credential, getBinary(client.getCryptoSuite()), ""); } public static class InsertResultEventResponse { diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java index aafa702d8..cb0776c06 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java @@ -15,7 +15,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple3; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -59,13 +59,11 @@ public class ParallelOk extends Contract { public static final String FUNC_TRANSFERWITHREVERT = "transferWithRevert"; protected ParallelOk(String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt registerParallelFunction( @@ -390,7 +388,6 @@ public static ParallelOk load(String contractAddress, Client client, CryptoKeyPa public static ParallelOk deploy(Client client, CryptoKeyPair credential) throws ContractException { - return deploy( - ParallelOk.class, client, credential, getBinary(client.getCryptoInterface()), ""); + return deploy(ParallelOk.class, client, credential, getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/TableTest.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/TableTest.java index 3f03defec..e9d418e6f 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/TableTest.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/contract/TableTest.java @@ -19,7 +19,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple3; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.eventsub.EventCallback; import org.fisco.bcos.sdk.model.CryptoType; @@ -90,13 +90,11 @@ public class TableTest extends Contract { Arrays.>asList(new TypeReference() {}));; protected TableTest(String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt update(String name, BigInteger item_id, String item_name) { @@ -472,8 +470,7 @@ public static TableTest load(String contractAddress, Client client, CryptoKeyPai public static TableTest deploy(Client client, CryptoKeyPair credential) throws ContractException { - return deploy( - TableTest.class, client, credential, getBinary(client.getCryptoInterface()), ""); + return deploy(TableTest.class, client, credential, getBinary(client.getCryptoSuite()), ""); } public static class CreateResultEventResponse { diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/event/SendOk.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/event/SendOk.java index cd790708b..44828e319 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/event/SendOk.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/event/SendOk.java @@ -52,7 +52,7 @@ public static void main(String[] args) { // deploy the HelloWorld System.out.println("====== Deploy Ok ====== "); - Ok ok = Ok.deploy(client, client.getCryptoInterface().getCryptoKeyPair()); + Ok ok = Ok.deploy(client, client.getCryptoSuite().getCryptoKeyPair()); System.out.println( "====== Deploy Ok successfully, address: " + ok.getContractAddress() diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/ParallelOkPerf.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/ParallelOkPerf.java index 19588e4e0..abdedd6fd 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/ParallelOkPerf.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/ParallelOkPerf.java @@ -109,8 +109,7 @@ public static void parallelOkPerf( switch (command) { case "add": // deploy ParallelOk - parallelOk = - ParallelOk.deploy(client, client.getCryptoInterface().getCryptoKeyPair()); + parallelOk = ParallelOk.deploy(client, client.getCryptoSuite().getCryptoKeyPair()); // enable parallel parallelOk.enableParallel(); System.out.println( @@ -125,7 +124,7 @@ public static void parallelOkPerf( ParallelOk.load( dagUserInfo.getContractAddr(), client, - client.getCryptoInterface().getCryptoKeyPair()); + client.getCryptoSuite().getCryptoKeyPair()); System.out.println( "====== ParallelOk trans, load success, address: " + parallelOk.getContractAddress()); diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceOk.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceOk.java index d1ea2ad54..b728cefcd 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceOk.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceOk.java @@ -72,7 +72,7 @@ public static void main(String[] args) { // deploy the HelloWorld System.out.println("====== Deploy Ok ====== "); - Ok ok = Ok.deploy(client, client.getCryptoInterface().getCryptoKeyPair()); + Ok ok = Ok.deploy(client, client.getCryptoSuite().getCryptoKeyPair()); System.out.println( "====== Deploy Ok succ, address: " + ok.getContractAddress() + " ====== "); diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceOkD.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceOkD.java index 625294e3c..cc50f5311 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceOkD.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceOkD.java @@ -72,7 +72,7 @@ public static void main(String[] args) { // deploy the HelloWorld System.out.println("====== Deploy OkD ====== "); - OkD okd = OkD.deploy(client, client.getCryptoInterface().getCryptoKeyPair()); + OkD okd = OkD.deploy(client, client.getCryptoSuite().getCryptoKeyPair()); System.out.println( "====== Deploy OkD success, address: " + okd.getContractAddress() + " ====== "); diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceTable.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceTable.java index a7cd03d58..9ad858064 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceTable.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/PerformanceTable.java @@ -86,7 +86,7 @@ public static void main(String[] args) { // deploy the HelloWorld System.out.println("====== Deploy TableTest ====== "); TableTest tableTest = - TableTest.deploy(client, client.getCryptoInterface().getCryptoKeyPair()); + TableTest.deploy(client, client.getCryptoSuite().getCryptoKeyPair()); // create table tableTest.create(); System.out.println( diff --git a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/parallel/DagPrecompiledDemo.java b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/parallel/DagPrecompiledDemo.java index c548f6bd9..01a3fa412 100644 --- a/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/parallel/DagPrecompiledDemo.java +++ b/sdk-demo/src/main/java/org/fisco/bcos/sdk/demo/perf/parallel/DagPrecompiledDemo.java @@ -47,7 +47,7 @@ public DagPrecompiledDemo( this.threadPoolService = threadPoolService; this.dagTransfer = DagTransfer.load( - DAG_TRANSFER_ADDR, client, client.getCryptoInterface().getCryptoKeyPair()); + DAG_TRANSFER_ADDR, client, client.getCryptoSuite().getCryptoKeyPair()); this.dagUserInfo = dagUserInfo; this.collector = new PerformanceCollector(); } diff --git a/sdk-service/src/main/java/org/fisco/bcos/sdk/client/Client.java b/sdk-service/src/main/java/org/fisco/bcos/sdk/client/Client.java index 86bc79e7d..58530d6b3 100644 --- a/sdk-service/src/main/java/org/fisco/bcos/sdk/client/Client.java +++ b/sdk-service/src/main/java/org/fisco/bcos/sdk/client/Client.java @@ -50,7 +50,7 @@ import org.fisco.bcos.sdk.client.protocol.response.TotalTransactionCount; import org.fisco.bcos.sdk.client.protocol.response.TransactionReceiptWithProof; import org.fisco.bcos.sdk.client.protocol.response.TransactionWithProof; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.eventsub.EventResource; import org.fisco.bcos.sdk.model.NodeVersion; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -103,11 +103,10 @@ static Client build( groupId); return null; } - CryptoInterface cryptoInterface = - new CryptoInterface(cryptoType, groupManagerService.getConfig()); + CryptoSuite cryptoSuite = new CryptoSuite(cryptoType, groupManagerService.getConfig()); logger.info("build client success for group {}", groupId); return new ClientImpl( - groupManagerService, channel, groupId, cryptoInterface, nodeVersion, eventResource); + groupManagerService, channel, groupId, cryptoSuite, nodeVersion, eventResource); } static Client build(Channel channel) { @@ -116,7 +115,7 @@ static Client build(Channel channel) { GroupManagerService getGroupManagerService(); - CryptoInterface getCryptoInterface(); + CryptoSuite getCryptoSuite(); NodeVersion getClientNodeVersion(); diff --git a/sdk-service/src/main/java/org/fisco/bcos/sdk/client/ClientImpl.java b/sdk-service/src/main/java/org/fisco/bcos/sdk/client/ClientImpl.java index 83e836241..7f0c9d6be 100644 --- a/sdk-service/src/main/java/org/fisco/bcos/sdk/client/ClientImpl.java +++ b/sdk-service/src/main/java/org/fisco/bcos/sdk/client/ClientImpl.java @@ -52,7 +52,7 @@ import org.fisco.bcos.sdk.client.protocol.response.TotalTransactionCount; import org.fisco.bcos.sdk.client.protocol.response.TransactionReceiptWithProof; import org.fisco.bcos.sdk.client.protocol.response.TransactionWithProof; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.eventsub.EventResource; import org.fisco.bcos.sdk.model.NodeVersion; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -64,7 +64,7 @@ public class ClientImpl implements Client { private final JsonRpcService jsonRpcService; private final Integer groupId; private final Integer DefaultGroupId = Integer.valueOf(1); - private final CryptoInterface cryptoInterface; + private final CryptoSuite cryptoSuite; private final NodeVersion nodeVersion; private final GroupManagerService groupManagerService; private EventResource eventResource; @@ -73,12 +73,12 @@ protected ClientImpl( GroupManagerService groupManagerService, Channel channel, Integer groupId, - CryptoInterface cryptoInterface, + CryptoSuite cryptoSuite, NodeVersion nodeVersion, EventResource eventResource) { this.jsonRpcService = new JsonRpcService(groupManagerService, channel, groupId); this.groupId = groupId; - this.cryptoInterface = cryptoInterface; + this.cryptoSuite = cryptoSuite; this.nodeVersion = nodeVersion; this.groupManagerService = groupManagerService; this.eventResource = eventResource; @@ -89,7 +89,7 @@ protected ClientImpl( protected ClientImpl(Channel channel) { this.jsonRpcService = new JsonRpcService(null, channel, null); this.groupId = null; - this.cryptoInterface = null; + this.cryptoSuite = null; this.nodeVersion = null; this.groupManagerService = null; } @@ -100,8 +100,8 @@ public GroupManagerService getGroupManagerService() { } @Override - public CryptoInterface getCryptoInterface() { - return this.cryptoInterface; + public CryptoSuite getCryptoSuite() { + return this.cryptoSuite; } @Override @@ -111,7 +111,7 @@ public NodeVersion getClientNodeVersion() { @Override public Integer getCryptoType() { - return this.cryptoInterface.getCryptoTypeConfig(); + return this.cryptoSuite.getCryptoTypeConfig(); } @Override 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 8265336c7..e78967d84 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 @@ -32,7 +32,7 @@ import org.fisco.bcos.sdk.abi.datatypes.Type; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.client.protocol.response.Call; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.eventsub.EventCallback; import org.fisco.bcos.sdk.eventsub.EventLogParams; @@ -59,7 +59,7 @@ public class Contract { public static final String FUNC_DEPLOY = "deploy"; protected final FunctionEncoder functionEncoder; protected final CryptoKeyPair credential; - protected final CryptoInterface cryptoInterface; + protected final CryptoSuite cryptoSuite; protected final EventEncoder eventEncoder; private final EventSubscribe eventSubscribe; protected static String LATEST_BLOCK = "latest"; @@ -75,9 +75,9 @@ protected Contract( this.client = client; this.transactionProcessor = transactionProcessor; this.credential = credential; - this.cryptoInterface = client.getCryptoInterface(); - this.functionEncoder = new FunctionEncoder(client.getCryptoInterface()); - this.eventEncoder = new EventEncoder(client.getCryptoInterface()); + this.cryptoSuite = client.getCryptoSuite(); + this.functionEncoder = new FunctionEncoder(client.getCryptoSuite()); + this.eventEncoder = new EventEncoder(client.getCryptoSuite()); // create eventSubscribe this.eventSubscribe = EventSubscribe.build( diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java index a4bd12ebe..59eaae583 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java @@ -15,7 +15,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple4; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -47,13 +47,11 @@ public class CNSPrecompiled extends Contract { public static final String FUNC_GETCONTRACTADDRESS = "getContractAddress"; protected CNSPrecompiled(String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public String selectByName(String name) throws ContractException { @@ -167,10 +165,6 @@ public static CNSPrecompiled load( public static CNSPrecompiled deploy(Client client, CryptoKeyPair credential) throws ContractException { return deploy( - CNSPrecompiled.class, - client, - credential, - getBinary(client.getCryptoInterface()), - ""); + CNSPrecompiled.class, client, credential, getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java index 2b8a7ce5e..0e21fe2f8 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java @@ -13,7 +13,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple1; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -44,13 +44,11 @@ public class ConsensusPrecompiled extends Contract { protected ConsensusPrecompiled( String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt addObserver(String param0) { @@ -220,7 +218,7 @@ public static ConsensusPrecompiled deploy(Client client, CryptoKeyPair credentia ConsensusPrecompiled.class, client, credential, - getBinary(client.getCryptoInterface()), + getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java index 3df0bc42f..570ec707a 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java @@ -16,7 +16,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple2; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -51,13 +51,11 @@ public class ContractLifeCyclePrecompiled extends Contract { protected ContractLifeCyclePrecompiled( String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public Tuple2 getStatus(String addr) throws ContractException { @@ -253,7 +251,7 @@ public static ContractLifeCyclePrecompiled deploy(Client client, CryptoKeyPair c ContractLifeCyclePrecompiled.class, client, credential, - getBinary(client.getCryptoInterface()), + getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java index b1d79a671..c5e6d06bf 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java @@ -16,7 +16,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple5; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -50,13 +50,11 @@ public class CRUD extends Contract { public static final String FUNC_REMOVE = "remove"; protected CRUD(String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt update( @@ -328,6 +326,6 @@ public static CRUD load(String contractAddress, Client client, CryptoKeyPair cre } public static CRUD deploy(Client client, CryptoKeyPair credential) throws ContractException { - return deploy(CRUD.class, client, credential, getBinary(client.getCryptoInterface()), ""); + return deploy(CRUD.class, client, credential, getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java index 75458a435..9b48a99e1 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java @@ -15,7 +15,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple3; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -43,13 +43,11 @@ public class TableFactory extends Contract { public static final String FUNC_OPENTABLE = "openTable"; protected TableFactory(String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt createTable(String param0, String param1, String param2) { @@ -136,6 +134,6 @@ public static TableFactory load( public static TableFactory deploy(Client client, CryptoKeyPair credential) throws ContractException { return deploy( - TableFactory.class, client, credential, getBinary(client.getCryptoInterface()), ""); + TableFactory.class, client, credential, getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java index ee55dd1c6..a264eb696 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java @@ -16,7 +16,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple2; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -67,13 +67,11 @@ public class ChainGovernancePrecompiled extends Contract { protected ChainGovernancePrecompiled( String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public String listOperators() throws ContractException { @@ -544,7 +542,7 @@ public static ChainGovernancePrecompiled deploy(Client client, CryptoKeyPair cre ChainGovernancePrecompiled.class, client, credential, - getBinary(client.getCryptoInterface()), + getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java index 393eeca85..d04caa083 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java @@ -15,7 +15,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple2; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -52,13 +52,11 @@ public class PermissionPrecompiled extends Contract { protected PermissionPrecompiled( String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt insert(String table_name, String addr) { @@ -322,7 +320,7 @@ public static PermissionPrecompiled deploy(Client client, CryptoKeyPair credenti PermissionPrecompiled.class, client, credential, - getBinary(client.getCryptoInterface()), + getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java index 0f5c1e153..acce33980 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java @@ -14,7 +14,7 @@ import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple2; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.contract.Contract; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; @@ -41,13 +41,11 @@ public class SystemConfigPrecompiled extends Contract { protected SystemConfigPrecompiled( String contractAddress, Client client, CryptoKeyPair credential) { - super(getBinary(client.getCryptoInterface()), contractAddress, client, credential); + super(getBinary(client.getCryptoSuite()), contractAddress, client, credential); } - public static String getBinary(CryptoInterface cryptoInterface) { - return (cryptoInterface.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE - ? BINARY - : SM_BINARY); + public static String getBinary(CryptoSuite cryptoSuite) { + return (cryptoSuite.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt setValueByKey(String key, String value) { @@ -119,7 +117,7 @@ public static SystemConfigPrecompiled deploy(Client client, CryptoKeyPair creden SystemConfigPrecompiled.class, client, credential, - getBinary(client.getCryptoInterface()), + getBinary(client.getCryptoSuite()), ""); } } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java index 2f656db87..265a0f48a 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java @@ -29,7 +29,7 @@ import org.fisco.bcos.sdk.abi.wrapper.ABIObject; import org.fisco.bcos.sdk.abi.wrapper.ABIObjectFactory; import org.fisco.bcos.sdk.abi.wrapper.ContractABIDefinition; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.model.RetCode; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.model.TransactionReceipt.Logs; @@ -44,16 +44,16 @@ public class TransactionDecoderService implements TransactionDecoderInterface { protected static Logger logger = LoggerFactory.getLogger(TransactionDecoderService.class); - private CryptoInterface cryptoInterface; + private CryptoSuite cryptoSuite; private final ABICodec abiCodec; private EventEncoder eventEncoder; - /** @param cryptoInterface */ - public TransactionDecoderService(CryptoInterface cryptoInterface) { + /** @param cryptoSuite */ + public TransactionDecoderService(CryptoSuite cryptoSuite) { super(); - this.cryptoInterface = cryptoInterface; - this.abiCodec = new ABICodec(cryptoInterface); - this.eventEncoder = new EventEncoder(cryptoInterface); + this.cryptoSuite = cryptoSuite; + this.abiCodec = new ABICodec(cryptoSuite); + this.eventEncoder = new EventEncoder(cryptoSuite); } @Override @@ -109,7 +109,7 @@ public TransactionResponse decodeReceiptStatus(TransactionReceipt receipt) { @Override public Map> decodeEvents(String abi, List logs) throws ABICodecException { - ABIDefinitionFactory abiDefinitionFactory = new ABIDefinitionFactory(cryptoInterface); + ABIDefinitionFactory abiDefinitionFactory = new ABIDefinitionFactory(cryptoSuite); ContractABIDefinition contractABIDefinition = abiDefinitionFactory.loadABI(abi); Map> eventsMap = contractABIDefinition.getEvents(); Map> result = new HashMap<>(); @@ -158,13 +158,13 @@ private String decodeMethodSign(ABIDefinition ABIDefinition) { return methodSign.toString(); } - /** @return the cryptoInterface */ - public CryptoInterface getCryptoInterface() { - return cryptoInterface; + /** @return the cryptoSuite */ + public CryptoSuite getCryptoSuite() { + return cryptoSuite; } - /** @param cryptoInterface the cryptoInterface to set */ - public void setCryptoInterface(CryptoInterface cryptoInterface) { - this.cryptoInterface = cryptoInterface; + /** @param cryptoSuite the cryptoSuite to set */ + public void setCryptoSuite(CryptoSuite cryptoSuite) { + this.cryptoSuite = cryptoSuite; } } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/encode/TransactionEncoderService.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/encode/TransactionEncoderService.java index 0a8578a42..9c41d6954 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/encode/TransactionEncoderService.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/encode/TransactionEncoderService.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.List; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.crypto.signature.Signature; import org.fisco.bcos.sdk.crypto.signature.SignatureResult; @@ -36,12 +36,12 @@ public class TransactionEncoderService implements TransactionEncoderInterface { protected static Logger logger = LoggerFactory.getLogger(TransactionEncoderService.class); private final Signature signature; private final TransactionSignerInterface transactionSignerService; - private final CryptoInterface cryptoInterface; + private final CryptoSuite cryptoSuite; - public TransactionEncoderService(CryptoInterface cryptoInterface) { + public TransactionEncoderService(CryptoSuite cryptoSuite) { super(); - this.cryptoInterface = cryptoInterface; - this.signature = cryptoInterface.getSignatureImpl(); + this.cryptoSuite = cryptoSuite; + this.signature = cryptoSuite.getSignatureImpl(); this.transactionSignerService = new TransactionSignerServcie(signature); } @@ -53,7 +53,7 @@ public String encodeAndSign(RawTransaction rawTransaction, CryptoKeyPair cryptoK @Override public byte[] encodeAndSignBytes(RawTransaction rawTransaction, CryptoKeyPair cryptoKeyPair) { byte[] encodedTransaction = encode(rawTransaction, null); - byte[] hash = cryptoInterface.hash(encodedTransaction); + byte[] hash = cryptoSuite.hash(encodedTransaction); SignatureResult result = transactionSignerService.sign(Hex.toHexString(hash), cryptoKeyPair); return encode(rawTransaction, result); diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java index 206f786d0..1b9e139ef 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java @@ -63,9 +63,9 @@ public AssembleTransactionProcessor( String chainId, ContractLoader contractLoader) { super(client, cryptoKeyPair, groupId, chainId); - this.transactionDecoder = new TransactionDecoderService(cryptoInterface); + this.transactionDecoder = new TransactionDecoderService(cryptoSuite); this.transactionPusher = new TransactionPusherService(client); - this.abiCodec = new ABICodec(cryptoInterface); + this.abiCodec = new ABICodec(cryptoSuite); this.contractLoader = contractLoader; } diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessor.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessor.java index 09b948ab3..e8c9b0cb0 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessor.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessor.java @@ -18,7 +18,7 @@ import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.client.protocol.request.Transaction; import org.fisco.bcos.sdk.client.protocol.response.Call; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.model.callback.TransactionCallback; @@ -34,7 +34,7 @@ public class TransactionProcessor implements TransactionProcessorInterface { protected static Logger log = LoggerFactory.getLogger(TransactionProcessor.class); - protected final CryptoInterface cryptoInterface; + protected final CryptoSuite cryptoSuite; protected final CryptoKeyPair cryptoKeyPair; protected final Client client; protected final Integer groupId; @@ -44,13 +44,13 @@ public class TransactionProcessor implements TransactionProcessorInterface { public TransactionProcessor( Client client, CryptoKeyPair cryptoKeyPair, Integer groupId, String chainId) { - this.cryptoInterface = client.getCryptoInterface(); + this.cryptoSuite = client.getCryptoSuite(); this.cryptoKeyPair = cryptoKeyPair; this.client = client; this.groupId = groupId; this.chainId = chainId; this.transactionBuilder = new TransactionBuilderService(client); - this.transactionEncoder = new TransactionEncoderService(client.getCryptoInterface()); + this.transactionEncoder = new TransactionEncoderService(client.getCryptoSuite()); } @Override diff --git a/src/integration-test/java/org/fisco/bcos/sdk/BcosSDKTest.java b/src/integration-test/java/org/fisco/bcos/sdk/BcosSDKTest.java index 5763cd5f7..0bf8df802 100644 --- a/src/integration-test/java/org/fisco/bcos/sdk/BcosSDKTest.java +++ b/src/integration-test/java/org/fisco/bcos/sdk/BcosSDKTest.java @@ -230,7 +230,7 @@ public void testSendTransactions() throws ConfigException, ContractException { BigInteger blockNumber = client.getBlockNumber().getBlockNumber(); // deploy the HelloWorld contract HelloWorld helloWorld = - HelloWorld.deploy(client, client.getCryptoInterface().getCryptoKeyPair()); + HelloWorld.deploy(client, client.getCryptoSuite().getCryptoKeyPair()); checkReceipt( helloWorld, client, @@ -274,7 +274,7 @@ public void testSendTransactions() throws ConfigException, ContractException { HelloWorld.load( helloWorld.getContractAddress(), client, - client.getCryptoInterface().getCryptoKeyPair()); + client.getCryptoSuite().getCryptoKeyPair()); Assert.assertTrue( helloWorld2.getContractAddress().equals(helloWorld.getContractAddress())); settedString = "Hello, Fisco2"; 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 86ad3958d..a479a2a92 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 @@ -25,7 +25,7 @@ import org.fisco.bcos.sdk.abi.ABICodecException; import org.fisco.bcos.sdk.abi.tools.TopicTools; import org.fisco.bcos.sdk.client.Client; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.model.ConstantConfig; import org.fisco.bcos.sdk.model.EventLog; import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionProcessor; @@ -60,7 +60,7 @@ public void testEventSubModule() { try { AssembleTransactionProcessor manager = TransactionProcessorFactory.createAssembleTransactionProcessor( - client, client.getCryptoInterface().createKeyPair(), abiFile, binFile); + client, client.getCryptoSuite().createKeyPair(), abiFile, binFile); // deploy List params = Lists.newArrayList(); params.add(1); @@ -90,9 +90,9 @@ public void testEventSubModule() { eventLogParams1.setToBlock("latest"); eventLogParams1.setAddresses(new ArrayList<>()); ArrayList topics = new ArrayList<>(); - CryptoInterface invalidCryptoInterface = - new CryptoInterface(client.getCryptoInterface().getCryptoTypeConfig()); - TopicTools topicTools = new TopicTools(invalidCryptoInterface); + CryptoSuite invalidCryptoSuite = + new CryptoSuite(client.getCryptoSuite().getCryptoTypeConfig()); + TopicTools topicTools = new TopicTools(invalidCryptoSuite); topics.add(topicTools.stringToTopic("LogSetValues(int256,address[],string)")); eventLogParams1.setTopics(topics); @@ -123,7 +123,7 @@ public void onReceiveLog(int status, List logs) { + log.getTransactionIndex() + " data:" + log.getData()); - ABICodec abiCodec = new ABICodec(client.getCryptoInterface()); + ABICodec abiCodec = new ABICodec(client.getCryptoSuite()); try { List list = abiCodec.decodeEvent(abi, "LogSetValues", log.getData()); diff --git a/src/integration-test/java/org/fisco/bcos/sdk/precompiled/PrecompiledTest.java b/src/integration-test/java/org/fisco/bcos/sdk/precompiled/PrecompiledTest.java index bef447e78..9cc155261 100644 --- a/src/integration-test/java/org/fisco/bcos/sdk/precompiled/PrecompiledTest.java +++ b/src/integration-test/java/org/fisco/bcos/sdk/precompiled/PrecompiledTest.java @@ -39,7 +39,7 @@ import org.fisco.bcos.sdk.contract.precompiled.permission.PermissionInfo; import org.fisco.bcos.sdk.contract.precompiled.permission.PermissionService; import org.fisco.bcos.sdk.contract.precompiled.sysconfig.SystemConfigService; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.crypto.CryptoSuite; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.demo.contract.HelloWorld; import org.fisco.bcos.sdk.model.ConstantConfig; @@ -67,7 +67,7 @@ public void test1ConsensusService() throws ConfigException, ContractException { try { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); ConsensusService consensusService = new ConsensusService(client, cryptoKeyPair); // get the current sealerList List sealerList = client.getSealerList().getResult(); @@ -134,7 +134,7 @@ public void test2CnsService() throws ConfigException { try { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); HelloWorld helloWorld = HelloWorld.deploy(client, cryptoKeyPair); String contractAddress = helloWorld.getContractAddress(); String contractName = "HelloWorld"; @@ -202,7 +202,7 @@ public void test3SystemConfigService() throws ConfigException, ContractException try { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); SystemConfigService systemConfigService = new SystemConfigService(client, cryptoKeyPair); testSystemConfigService(client, systemConfigService, "tx_count_limit"); @@ -233,7 +233,7 @@ public void test5CRUDService() throws ConfigException, ContractException { try { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); TableCRUDService tableCRUDService = new TableCRUDService(client, cryptoKeyPair); // create a user table String tableName = "test"; @@ -288,7 +288,7 @@ public void test51SyncCRUDService() throws ConfigException { try { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); TableCRUDService crudService = new TableCRUDService(client, cryptoKeyPair); String tableName = "test_sync"; List valueFiled = new ArrayList<>(); @@ -366,7 +366,7 @@ public void test52AsyncCRUDService() { try { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); TableCRUDService crudService = new TableCRUDService(client, cryptoKeyPair); // create table String tableName = "send_async"; @@ -445,17 +445,17 @@ public void test6PermissionService() throws ConfigException, ContractException { try { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); PermissionService permissionService = new PermissionService(client, cryptoKeyPair); String tableName = "test"; permissionService.grantPermission(tableName, cryptoKeyPair.getAddress()); // insert data to the table with the account without permission - CryptoInterface invalidCryptoInterface = - new CryptoInterface(client.getCryptoInterface().getCryptoTypeConfig()); + CryptoSuite invalidCryptoSuite = + new CryptoSuite(client.getCryptoSuite().getCryptoTypeConfig()); TableCRUDService tableCRUDService = - new TableCRUDService(client, invalidCryptoInterface.createKeyPair()); + new TableCRUDService(client, invalidCryptoSuite.createKeyPair()); String key = "key2"; Map value = new HashMap<>(5); for (int i = 0; i < 5; i++) { @@ -486,7 +486,7 @@ public void test7ContractLifeCycleService() throws ConfigException { try { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); ContractLifeCycleService contractLifeCycleService = new ContractLifeCycleService(client, cryptoKeyPair); // deploy a helloWorld @@ -511,9 +511,9 @@ public void test7ContractLifeCycleService() throws ConfigException { System.out.println("==== after set: " + value); // Assert.assertTrue("Hello, Fisco1".equals(value)); // grant Manager - CryptoInterface cryptoInterface1 = - new CryptoInterface(client.getCryptoInterface().getCryptoTypeConfig()); - CryptoKeyPair cryptoKeyPair1 = cryptoInterface1.createKeyPair(); + CryptoSuite cryptoSuite1 = + new CryptoSuite(client.getCryptoSuite().getCryptoTypeConfig()); + CryptoKeyPair cryptoKeyPair1 = cryptoSuite1.createKeyPair(); ContractLifeCycleService contractLifeCycleService1 = new ContractLifeCycleService(client, cryptoKeyPair1); // freeze contract without grant manager @@ -543,7 +543,7 @@ public void test8GovernanceService() throws ConfigException { try { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); ChainGovernanceService chainGovernanceService = new ChainGovernanceService(client, cryptoKeyPair); @@ -564,9 +564,9 @@ public void test8GovernanceService() throws ConfigException { // create a new account and grantOperator int orgOperatorSize = chainGovernanceService.listOperators().size(); - CryptoInterface cryptoInterface1 = - new CryptoInterface(client.getCryptoInterface().getCryptoTypeConfig()); - CryptoKeyPair cryptoKeyPair1 = cryptoInterface1.createKeyPair(); + CryptoSuite cryptoSuite1 = + new CryptoSuite(client.getCryptoSuite().getCryptoTypeConfig()); + CryptoKeyPair cryptoKeyPair1 = cryptoSuite1.createKeyPair(); chainGovernanceService.grantOperator(cryptoKeyPair.getAddress()); // Assert.assertTrue(chainGovernanceService.listOperators().size() == orgOperatorSize + // 1); @@ -578,8 +578,7 @@ public void test8GovernanceService() throws ConfigException { // only the committeeMember can freeze account CryptoKeyPair cryptoKeyPair2 = - new CryptoInterface(client.getCryptoInterface().getCryptoTypeConfig()) - .createKeyPair(); + new CryptoSuite(client.getCryptoSuite().getCryptoTypeConfig()).createKeyPair(); chainGovernanceService.grantOperator(cryptoKeyPair2.getAddress()); // create the account HelloWorld helloWorld = HelloWorld.deploy(client, cryptoKeyPair2); 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 86b8688f6..f49d344f6 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 @@ -49,8 +49,8 @@ public void testDecode() throws Exception { // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); AssembleTransactionProcessor manager = TransactionProcessorFactory.createAssembleTransactionProcessor( - client, client.getCryptoInterface().createKeyPair(), abiFile, binFile); - ABICodec abiCodec = new ABICodec(client.getCryptoInterface()); + client, client.getCryptoSuite().createKeyPair(), abiFile, binFile); + ABICodec abiCodec = new ABICodec(client.getCryptoSuite()); // deploy List params = Lists.newArrayList(); params.add(1); 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 e9674dc45..e384a77b9 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 @@ -51,12 +51,12 @@ public void testDecode() throws Exception { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); TransactionDecoderInterface decoder = - new TransactionDecoderService(client.getCryptoInterface()); + new TransactionDecoderService(client.getCryptoSuite()); ContractLoader contractLoader = new ContractLoader(abiFile, binFile); String abi = contractLoader.getABIByContractName(contractName); AssembleTransactionProcessor manager = TransactionProcessorFactory.createAssembleTransactionProcessor( - client, client.getCryptoInterface().createKeyPair(), abiFile, binFile); + client, client.getCryptoSuite().createKeyPair(), abiFile, binFile); // deploy List params = Lists.newArrayList(); params.add(1); diff --git a/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java b/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java index 315d6cc1d..c94c2e8af 100644 --- a/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java +++ b/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java @@ -61,7 +61,7 @@ public void test1HelloWorld() throws Exception { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); AssembleTransactionProcessor transactionProcessor = TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); @@ -117,7 +117,7 @@ public void test2ComplexDeploy() throws Exception { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); AssembleTransactionProcessor transactionProcessor = TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); @@ -151,7 +151,7 @@ public void test3ComplexQuery() throws Exception { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); AssembleTransactionProcessor transactionProcessor = TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); @@ -198,7 +198,7 @@ public void test4ComplexEmptyTx() throws Exception { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); AssembleTransactionProcessor transactionProcessor = TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); @@ -224,7 +224,7 @@ public void test5ComplexIncrement() throws Exception { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); AssembleTransactionProcessor transactionProcessor = TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); @@ -272,7 +272,7 @@ public void test6ComplexSetValues() throws Exception { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); AssembleTransactionProcessor transactionProcessor = TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); @@ -306,7 +306,7 @@ public void test7ComplexSetBytes() throws Exception { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); AssembleTransactionProcessor transactionProcessor = TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile); @@ -354,7 +354,7 @@ public void test8ComplexSetBytesFuture() throws Exception { BcosSDK sdk = BcosSDK.build(configFile); Client client = sdk.getClient(Integer.valueOf(1)); // System.out.println(cryptoInterface.getCryptoKeyPair().getAddress()); - CryptoKeyPair cryptoKeyPair = client.getCryptoInterface().createKeyPair(); + CryptoKeyPair cryptoKeyPair = client.getCryptoSuite().createKeyPair(); AssembleTransactionProcessor transactionProcessor = TransactionProcessorFactory.createAssembleTransactionProcessor( client, cryptoKeyPair, abiFile, binFile);