huanghaiquan
5 years ago
43 changed files with 161 additions and 161 deletions
Unified View
Diff Options
-
+3 -3source/consensus/consensus-bftsmart/src/test/java/test/com/jd/blockchain/consensus/bftsmart/proxyClientTest.java
-
+2 -2source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployMojo.java
-
+8 -8source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractDeployExeUtil.java
-
+2 -2source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/AccountSetTest.java
-
+2 -2source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/BaseAccountTest.java
-
+3 -3source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerAdminAccountTest.java
-
+3 -3source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java
-
+3 -3source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitOperationTest.java
-
+3 -3source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitSettingTest.java
-
+3 -3source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerManagerTest.java
-
+2 -2source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTransactionDataTest.java
-
+6 -6source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TransactionSetTest.java
-
+4 -4source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainKeyGenerator.java
-
+3 -3source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainKeypair.java
-
+2 -2source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/AddressEncodingTest.java
-
+2 -2source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxContentBlobTest.java
-
+2 -2source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxRequestMessageTest.java
-
+7 -7source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java
-
+2 -2source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Contract.java
-
+3 -3source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_DataAccount.java
-
+2 -2source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_InsertData.java
-
+2 -2source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Query.java
-
+3 -3source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterAccount.java
-
+3 -3source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterUser.java
-
+3 -3source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_User.java
-
+2 -2source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java
-
+5 -5source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java
-
+2 -2source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java
-
+4 -4source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java
-
+5 -5source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java
-
+11 -11source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.java
-
+5 -5source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/consensus/ConsensusTest.java
-
+5 -5source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/GlobalPerformanceTest.java
-
+5 -5source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java
-
+10 -10source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java
-
+4 -4source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTest2.java
-
+2 -2source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTest4Bftsmart.java
-
+1 -1source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTest4MQ.java
-
+13 -13source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTestAll4Redis.java
-
+2 -2source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTestDataAccount.java
-
+1 -1source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/batch/bftsmart/BftsmartLedgerInit.java
-
+2 -2source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/ledger/LedgerBlockGeneratingTest.java
-
+4 -4source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/RemoteTransactionService.java
+ 3
- 3
source/consensus/consensus-bftsmart/src/test/java/test/com/jd/blockchain/consensus/bftsmart/proxyClientTest.java
View File
| @@ -10,7 +10,7 @@ import com.jd.blockchain.consensus.bftsmart.service.BftsmartServerSettingConfig; | |||||
| import com.jd.blockchain.consensus.service.ServerSettings; | import com.jd.blockchain.consensus.service.ServerSettings; | ||||
| import com.jd.blockchain.crypto.PubKey; | import com.jd.blockchain.crypto.PubKey; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.utils.PropertiesUtils; | import com.jd.blockchain.utils.PropertiesUtils; | ||||
| import com.jd.blockchain.utils.io.BytesUtils; | import com.jd.blockchain.utils.io.BytesUtils; | ||||
| import com.jd.blockchain.utils.net.NetworkAddress; | import com.jd.blockchain.utils.net.NetworkAddress; | ||||
| @@ -62,7 +62,7 @@ public class proxyClientTest { | |||||
| BftsmartNodeSettings[] nodesSettings = new BftsmartNodeSettings[nodeNum]; | BftsmartNodeSettings[] nodesSettings = new BftsmartNodeSettings[nodeNum]; | ||||
| for (int i = 0; i < nodeNum; i++) { | for (int i = 0; i < nodeNum; i++) { | ||||
| BlockchainKeyPair keyPair = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair keyPair = BlockchainKeyGenerator.getInstance().generate(); | |||||
| PubKey pubKey = keyPair.getPubKey(); | PubKey pubKey = keyPair.getPubKey(); | ||||
| NetworkAddress peerNodeServ = new NetworkAddress("127.0.0.1", peerStartPort + i * 10); | NetworkAddress peerNodeServ = new NetworkAddress("127.0.0.1", peerStartPort + i * 10); | ||||
| NodeSettings node = new BftsmartNodeConfig(pubKey, i, peerNodeServ); | NodeSettings node = new BftsmartNodeConfig(pubKey, i, peerNodeServ); | ||||
| @@ -87,7 +87,7 @@ public class proxyClientTest { | |||||
| public void proxyClientSend(BftsmartNodeServer nodeServer) { | public void proxyClientSend(BftsmartNodeServer nodeServer) { | ||||
| BftsmartClientIncomingConfig clientIncomingConfig = new BftsmartClientIncomingConfig(); | BftsmartClientIncomingConfig clientIncomingConfig = new BftsmartClientIncomingConfig(); | ||||
| BlockchainKeyPair keyPair = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair keyPair = BlockchainKeyGenerator.getInstance().generate(); | |||||
| clientIncomingConfig.setPubKey(keyPair.getPubKey()); | clientIncomingConfig.setPubKey(keyPair.getPubKey()); | ||||
| clientIncomingConfig.setClientId(0); | clientIncomingConfig.setClientId(0); | ||||
| clientIncomingConfig.setConsensusSettings(nodeServer.getConsensusSetting()); | clientIncomingConfig.setConsensusSettings(nodeServer.getConsensusSetting()); | ||||
+ 2
- 2
source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployMojo.java
View File
| @@ -4,7 +4,7 @@ import com.jd.blockchain.contract.model.ContractDeployExeUtil; | |||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.crypto.PrivKey; | import com.jd.blockchain.crypto.PrivKey; | ||||
| import com.jd.blockchain.crypto.PubKey; | import com.jd.blockchain.crypto.PubKey; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.tools.keygen.KeyGenCommand; | import com.jd.blockchain.tools.keygen.KeyGenCommand; | ||||
| import com.jd.blockchain.utils.codec.Base58Utils; | import com.jd.blockchain.utils.codec.Base58Utils; | ||||
| import com.jd.blockchain.utils.io.FileUtils; | import com.jd.blockchain.utils.io.FileUtils; | ||||
| @@ -104,7 +104,7 @@ public class ContractDeployMojo extends AbstractMojo { | |||||
| PrivKey prv = KeyGenCommand.decodePrivKeyWithRawPassword(prvKey, password); | PrivKey prv = KeyGenCommand.decodePrivKeyWithRawPassword(prvKey, password); | ||||
| PubKey pub = KeyGenCommand.decodePubKey(pubKey); | PubKey pub = KeyGenCommand.decodePubKey(pubKey); | ||||
| BlockchainKeyPair blockchainKeyPair = new BlockchainKeyPair(pub, prv); | |||||
| BlockchainKeypair blockchainKeyPair = new BlockchainKeypair(pub, prv); | |||||
| HashDigest ledgerHash = new HashDigest(Base58Utils.decode(ledger)); | HashDigest ledgerHash = new HashDigest(Base58Utils.decode(ledger)); | ||||
| StringBuffer sb = new StringBuffer(); | StringBuffer sb = new StringBuffer(); | ||||
+ 8
- 8
source/contract/contract-model/src/main/java/com/jd/blockchain/contract/model/ContractDeployExeUtil.java
View File
| @@ -12,7 +12,7 @@ import com.jd.blockchain.crypto.PubKey; | |||||
| import com.jd.blockchain.ledger.BlockchainIdentity; | import com.jd.blockchain.ledger.BlockchainIdentity; | ||||
| import com.jd.blockchain.ledger.BlockchainIdentityData; | import com.jd.blockchain.ledger.BlockchainIdentityData; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.ContractCodeDeployOperation; | import com.jd.blockchain.ledger.ContractCodeDeployOperation; | ||||
| import com.jd.blockchain.ledger.ContractEventSendOperation; | import com.jd.blockchain.ledger.ContractEventSendOperation; | ||||
| import com.jd.blockchain.ledger.DataAccountKVSetOperation; | import com.jd.blockchain.ledger.DataAccountKVSetOperation; | ||||
| @@ -43,7 +43,7 @@ public enum ContractDeployExeUtil { | |||||
| private BlockchainService bcsrv; | private BlockchainService bcsrv; | ||||
| private Bytes contractAddress; | private Bytes contractAddress; | ||||
| public BlockchainKeyPair getKeyPair(String pubPath, String prvPath, String rawPassword){ | |||||
| public BlockchainKeypair getKeyPair(String pubPath, String prvPath, String rawPassword){ | |||||
| PubKey pub = null; | PubKey pub = null; | ||||
| PrivKey prv = null; | PrivKey prv = null; | ||||
| try { | try { | ||||
| @@ -54,14 +54,14 @@ public enum ContractDeployExeUtil { | |||||
| e.printStackTrace(); | e.printStackTrace(); | ||||
| } | } | ||||
| return new BlockchainKeyPair(pub, prv); | |||||
| return new BlockchainKeypair(pub, prv); | |||||
| } | } | ||||
| public PubKey getPubKey(String pubPath){ | public PubKey getPubKey(String pubPath){ | ||||
| PubKey pub = null; | PubKey pub = null; | ||||
| try { | try { | ||||
| if(pubPath == null){ | if(pubPath == null){ | ||||
| BlockchainKeyPair contractKeyPair = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractKeyPair = BlockchainKeyGenerator.getInstance().generate(); | |||||
| pub = contractKeyPair.getPubKey(); | pub = contractKeyPair.getPubKey(); | ||||
| }else { | }else { | ||||
| pub = KeyGenCommand.readPubKey(pubPath); | pub = KeyGenCommand.readPubKey(pubPath); | ||||
| @@ -123,7 +123,7 @@ public enum ContractDeployExeUtil { | |||||
| return bcsrv; | return bcsrv; | ||||
| } | } | ||||
| public boolean deploy(HashDigest ledgerHash, BlockchainIdentity contractIdentity, BlockchainKeyPair ownerKey, byte[] chainCode){ | |||||
| public boolean deploy(HashDigest ledgerHash, BlockchainIdentity contractIdentity, BlockchainKeypair ownerKey, byte[] chainCode){ | |||||
| register(); | register(); | ||||
| TransactionTemplate txTpl = bcsrv.newTransaction(ledgerHash); | TransactionTemplate txTpl = bcsrv.newTransaction(ledgerHash); | ||||
| @@ -139,7 +139,7 @@ public enum ContractDeployExeUtil { | |||||
| System.out.println("contract's address="+contractAddress); | System.out.println("contract's address="+contractAddress); | ||||
| return txResp.isSuccess(); | return txResp.isSuccess(); | ||||
| } | } | ||||
| public boolean deploy(String host, int port, HashDigest ledgerHash, BlockchainKeyPair ownerKey, byte[] chainCode){ | |||||
| public boolean deploy(String host, int port, HashDigest ledgerHash, BlockchainKeypair ownerKey, byte[] chainCode){ | |||||
| register(); | register(); | ||||
| BlockchainIdentity contractIdentity = BlockchainKeyGenerator.getInstance().generate().getIdentity(); | BlockchainIdentity contractIdentity = BlockchainKeyGenerator.getInstance().generate().getIdentity(); | ||||
| @@ -154,7 +154,7 @@ public enum ContractDeployExeUtil { | |||||
| BlockchainIdentity contractIdentity = new BlockchainIdentityData(pubKey); | BlockchainIdentity contractIdentity = new BlockchainIdentityData(pubKey); | ||||
| byte[] chainCode = getChainCode(chainCodePath); | byte[] chainCode = getChainCode(chainCodePath); | ||||
| BlockchainKeyPair ownerKey = getKeyPair(ownerPubPath, ownerPrvPath, ownerPassword); | |||||
| BlockchainKeypair ownerKey = getKeyPair(ownerPubPath, ownerPrvPath, ownerPassword); | |||||
| HashDigest ledgerHash = new HashDigest(Base58Utils.decode(ledger)); | HashDigest ledgerHash = new HashDigest(Base58Utils.decode(ledger)); | ||||
| initBcsrv(host,port); | initBcsrv(host,port); | ||||
| return deploy(ledgerHash, contractIdentity, ownerKey, chainCode); | return deploy(ledgerHash, contractIdentity, ownerKey, chainCode); | ||||
| @@ -162,7 +162,7 @@ public enum ContractDeployExeUtil { | |||||
| public boolean exeContract(String ledger,String ownerPubPath, String ownerPrvPath, | public boolean exeContract(String ledger,String ownerPubPath, String ownerPrvPath, | ||||
| String ownerPassword,String event,String contractArgs){ | String ownerPassword,String event,String contractArgs){ | ||||
| BlockchainKeyPair ownerKey = getKeyPair(ownerPubPath, ownerPrvPath, ownerPassword); | |||||
| BlockchainKeypair ownerKey = getKeyPair(ownerPubPath, ownerPrvPath, ownerPassword); | |||||
| HashDigest ledgerHash = new HashDigest(Base58Utils.decode(ledger)); | HashDigest ledgerHash = new HashDigest(Base58Utils.decode(ledger)); | ||||
| // 定义交易,传输最简单的数字、字符串、提取合约中的地址; | // 定义交易,传输最简单的数字、字符串、提取合约中的地址; | ||||
+ 2
- 2
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/AccountSetTest.java
View File
| @@ -10,7 +10,7 @@ import com.jd.blockchain.crypto.CryptoAlgorithm; | |||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.core.AccountSet; | import com.jd.blockchain.ledger.core.AccountSet; | ||||
| import com.jd.blockchain.ledger.core.BaseAccount; | import com.jd.blockchain.ledger.core.BaseAccount; | ||||
| import com.jd.blockchain.ledger.core.CryptoConfig; | import com.jd.blockchain.ledger.core.CryptoConfig; | ||||
| @@ -32,7 +32,7 @@ public class AccountSetTest { | |||||
| String keyPrefix = ""; | String keyPrefix = ""; | ||||
| AccountSet accset = new AccountSet(cryptoConf,keyPrefix, storage, storage, accessPolicy); | AccountSet accset = new AccountSet(cryptoConf,keyPrefix, storage, storage, accessPolicy); | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| accset.register(userKey.getAddress(), userKey.getPubKey()); | accset.register(userKey.getAddress(), userKey.getPubKey()); | ||||
| BaseAccount userAcc = accset.getAccount(userKey.getAddress()); | BaseAccount userAcc = accset.getAccount(userKey.getAddress()); | ||||
+ 2
- 2
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/BaseAccountTest.java
View File
| @@ -9,7 +9,7 @@ import org.springframework.util.StringUtils; | |||||
| import com.jd.blockchain.crypto.CryptoAlgorithm; | import com.jd.blockchain.crypto.CryptoAlgorithm; | ||||
| import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.core.BaseAccount; | import com.jd.blockchain.ledger.core.BaseAccount; | ||||
| import com.jd.blockchain.ledger.core.CryptoConfig; | import com.jd.blockchain.ledger.core.CryptoConfig; | ||||
| import com.jd.blockchain.ledger.core.impl.OpeningAccessPolicy; | import com.jd.blockchain.ledger.core.impl.OpeningAccessPolicy; | ||||
| @@ -35,7 +35,7 @@ public class BaseAccountTest { | |||||
| OpeningAccessPolicy accPlc = new OpeningAccessPolicy(); | OpeningAccessPolicy accPlc = new OpeningAccessPolicy(); | ||||
| BlockchainKeyPair bck = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair bck = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 新建账户； | // 新建账户； | ||||
| BaseAccount baseAccount = new BaseAccount(bck.getIdentity(), cryptoConf, keyPrefix, testStorage, testStorage, | BaseAccount baseAccount = new BaseAccount(bck.getIdentity(), cryptoConf, keyPrefix, testStorage, testStorage, | ||||
+ 3
- 3
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerAdminAccountTest.java
View File
| @@ -16,7 +16,7 @@ import com.jd.blockchain.crypto.CryptoAlgorithm; | |||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.ParticipantNode; | import com.jd.blockchain.ledger.ParticipantNode; | ||||
| import com.jd.blockchain.ledger.core.CryptoConfig; | import com.jd.blockchain.ledger.core.CryptoConfig; | ||||
| import com.jd.blockchain.ledger.core.LedgerAdminAccount; | import com.jd.blockchain.ledger.core.LedgerAdminAccount; | ||||
| @@ -38,7 +38,7 @@ public class LedgerAdminAccountTest { | |||||
| String keyPrefix = ""; | String keyPrefix = ""; | ||||
| LedgerInitSettingData initSetting = new LedgerInitSettingData(); | LedgerInitSettingData initSetting = new LedgerInitSettingData(); | ||||
| ConsensusParticipantData[] parties = new ConsensusParticipantData[5]; | ConsensusParticipantData[] parties = new ConsensusParticipantData[5]; | ||||
| BlockchainKeyPair[] bckeys = new BlockchainKeyPair[parties.length]; | |||||
| BlockchainKeypair[] bckeys = new BlockchainKeypair[parties.length]; | |||||
| for (int i = 0; i < parties.length; i++) { | for (int i = 0; i < parties.length; i++) { | ||||
| bckeys[i] = BlockchainKeyGenerator.getInstance().generate(); | bckeys[i] = BlockchainKeyGenerator.getInstance().generate(); | ||||
| parties[i] = new ConsensusParticipantData(); | parties[i] = new ConsensusParticipantData(); | ||||
| @@ -184,7 +184,7 @@ public class LedgerAdminAccountTest { | |||||
| new NetworkAddress("192.168.10." + (10 + newParti.getAddress()), 10010 + 10 * newParti.getId())); | new NetworkAddress("192.168.10." + (10 + newParti.getAddress()), 10010 + 10 * newParti.getId())); | ||||
| newParti.setName("Participant[" + newParti.getAddress() + "]"); | newParti.setName("Participant[" + newParti.getAddress() + "]"); | ||||
| BlockchainKeyPair newKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair newKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| newParti.setPubKey(newKey.getPubKey()); | newParti.setPubKey(newKey.getPubKey()); | ||||
| Throwable ex = null; | Throwable ex = null; | ||||
+ 3
- 3
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java
View File
| @@ -13,7 +13,7 @@ import com.jd.blockchain.crypto.AsymmetricKeypair; | |||||
| import com.jd.blockchain.crypto.CryptoServiceProviders; | import com.jd.blockchain.crypto.CryptoServiceProviders; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| import com.jd.blockchain.ledger.LedgerInitSetting; | import com.jd.blockchain.ledger.LedgerInitSetting; | ||||
| import com.jd.blockchain.ledger.LedgerTransaction; | import com.jd.blockchain.ledger.LedgerTransaction; | ||||
| @@ -62,7 +62,7 @@ public class LedgerEditerTest { | |||||
| @Test | @Test | ||||
| public void testWriteDataAccoutKvOp() { | public void testWriteDataAccoutKvOp() { | ||||
| BlockchainKeyPair dataKP = new BlockchainKeyPair(cryptoKeyPair.getPubKey(), cryptoKeyPair.getPrivKey()); | |||||
| BlockchainKeypair dataKP = new BlockchainKeypair(cryptoKeyPair.getPubKey(), cryptoKeyPair.getPrivKey()); | |||||
| DataAccount dataAccount = ldgDS.getDataAccountSet().register(dataKP.getAddress(), dataKP.getPubKey(), null); | DataAccount dataAccount = ldgDS.getDataAccountSet().register(dataKP.getAddress(), dataKP.getPubKey(), null); | ||||
| @@ -83,7 +83,7 @@ public class LedgerEditerTest { | |||||
| @Test | @Test | ||||
| public void testLedgerEditorCreation() { | public void testLedgerEditorCreation() { | ||||
| BlockchainKeyPair userKP = new BlockchainKeyPair(cryptoKeyPair.getPubKey(), cryptoKeyPair.getPrivKey()); | |||||
| BlockchainKeypair userKP = new BlockchainKeypair(cryptoKeyPair.getPubKey(), cryptoKeyPair.getPrivKey()); | |||||
| UserAccount userAccount = ldgDS.getUserAccountSet().register(userKP.getAddress(), userKP.getPubKey()); | UserAccount userAccount = ldgDS.getUserAccountSet().register(userKP.getAddress(), userKP.getPubKey()); | ||||
| userAccount.setProperty("Name", "孙悟空", -1); | userAccount.setProperty("Name", "孙悟空", -1); | ||||
| userAccount.setProperty("Age", "10000", -1); | userAccount.setProperty("Age", "10000", -1); | ||||
+ 3
- 3
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitOperationTest.java
View File
| @@ -6,7 +6,7 @@ import com.jd.blockchain.crypto.AddressEncoding; | |||||
| import com.jd.blockchain.crypto.CryptoAlgorithm; | import com.jd.blockchain.crypto.CryptoAlgorithm; | ||||
| import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.LedgerInitOperation; | import com.jd.blockchain.ledger.LedgerInitOperation; | ||||
| import com.jd.blockchain.ledger.LedgerInitSetting; | import com.jd.blockchain.ledger.LedgerInitSetting; | ||||
| import com.jd.blockchain.ledger.core.CryptoConfig; | import com.jd.blockchain.ledger.core.CryptoConfig; | ||||
| @@ -60,7 +60,7 @@ public class LedgerInitOperationTest { | |||||
| @Test | @Test | ||||
| public void test_LedgerInitOperation_ConsensusParticipantData() { | public void test_LedgerInitOperation_ConsensusParticipantData() { | ||||
| ConsensusParticipantData[] parties = new ConsensusParticipantData[4]; | ConsensusParticipantData[] parties = new ConsensusParticipantData[4]; | ||||
| BlockchainKeyPair[] keys = new BlockchainKeyPair[parties.length]; | |||||
| BlockchainKeypair[] keys = new BlockchainKeypair[parties.length]; | |||||
| for (int i = 0; i < parties.length; i++) { | for (int i = 0; i < parties.length; i++) { | ||||
| keys[i] = BlockchainKeyGenerator.getInstance().generate(); | keys[i] = BlockchainKeyGenerator.getInstance().generate(); | ||||
| parties[i] = new ConsensusParticipantData(); | parties[i] = new ConsensusParticipantData(); | ||||
| @@ -96,7 +96,7 @@ public class LedgerInitOperationTest { | |||||
| @Test | @Test | ||||
| public void test_LedgerInitOperation_ParticipantCertData() { | public void test_LedgerInitOperation_ParticipantCertData() { | ||||
| ParticipantCertData[] parties = new ParticipantCertData[4]; | ParticipantCertData[] parties = new ParticipantCertData[4]; | ||||
| BlockchainKeyPair[] keys = new BlockchainKeyPair[parties.length]; | |||||
| BlockchainKeypair[] keys = new BlockchainKeypair[parties.length]; | |||||
| for (int i = 0; i < parties.length; i++) { | for (int i = 0; i < parties.length; i++) { | ||||
| keys[i] = BlockchainKeyGenerator.getInstance().generate(); | keys[i] = BlockchainKeyGenerator.getInstance().generate(); | ||||
+ 3
- 3
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerInitSettingTest.java
View File
| @@ -6,7 +6,7 @@ import com.jd.blockchain.crypto.AddressEncoding; | |||||
| import com.jd.blockchain.crypto.CryptoAlgorithm; | import com.jd.blockchain.crypto.CryptoAlgorithm; | ||||
| import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.LedgerInitOperation; | import com.jd.blockchain.ledger.LedgerInitOperation; | ||||
| import com.jd.blockchain.ledger.LedgerInitSetting; | import com.jd.blockchain.ledger.LedgerInitSetting; | ||||
| import com.jd.blockchain.ledger.core.CryptoConfig; | import com.jd.blockchain.ledger.core.CryptoConfig; | ||||
| @@ -61,7 +61,7 @@ public class LedgerInitSettingTest { | |||||
| public void test_ledgerinitsetting_ConsensusParticipantData() { | public void test_ledgerinitsetting_ConsensusParticipantData() { | ||||
| ConsensusParticipantData[] parties = new ConsensusParticipantData[4]; | ConsensusParticipantData[] parties = new ConsensusParticipantData[4]; | ||||
| BlockchainKeyPair[] keys = new BlockchainKeyPair[parties.length]; | |||||
| BlockchainKeypair[] keys = new BlockchainKeypair[parties.length]; | |||||
| for (int i = 0; i < parties.length; i++) { | for (int i = 0; i < parties.length; i++) { | ||||
| keys[i] = BlockchainKeyGenerator.getInstance().generate(); | keys[i] = BlockchainKeyGenerator.getInstance().generate(); | ||||
| parties[i] = new ConsensusParticipantData(); | parties[i] = new ConsensusParticipantData(); | ||||
| @@ -103,7 +103,7 @@ public class LedgerInitSettingTest { | |||||
| public void test_ledgerinitsetting_ParticipantCertData() { | public void test_ledgerinitsetting_ParticipantCertData() { | ||||
| ParticipantCertData[] parties = new ParticipantCertData[4]; | ParticipantCertData[] parties = new ParticipantCertData[4]; | ||||
| BlockchainKeyPair[] keys = new BlockchainKeyPair[parties.length]; | |||||
| BlockchainKeypair[] keys = new BlockchainKeypair[parties.length]; | |||||
| for (int i = 0; i < parties.length; i++) { | for (int i = 0; i < parties.length; i++) { | ||||
| keys[i] = BlockchainKeyGenerator.getInstance().generate(); | keys[i] = BlockchainKeyGenerator.getInstance().generate(); | ||||
+ 3
- 3
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerManagerTest.java
View File
| @@ -18,7 +18,7 @@ import com.jd.blockchain.crypto.SignatureFunction; | |||||
| import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | ||||
| import com.jd.blockchain.ledger.BlockBody; | import com.jd.blockchain.ledger.BlockBody; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DataAccountRegisterOperation; | import com.jd.blockchain.ledger.DataAccountRegisterOperation; | ||||
| import com.jd.blockchain.ledger.DigitalSignature; | import com.jd.blockchain.ledger.DigitalSignature; | ||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| @@ -81,7 +81,7 @@ public class LedgerManagerTest { | |||||
| // 记录交易，注册用户； | // 记录交易，注册用户； | ||||
| LedgerTransactionContext txCtx = ldgEdt.newTransaction(genesisTxReq); | LedgerTransactionContext txCtx = ldgEdt.newTransaction(genesisTxReq); | ||||
| LedgerDataSet ldgDS = txCtx.getDataSet(); | LedgerDataSet ldgDS = txCtx.getDataSet(); | ||||
| BlockchainKeyPair userKP = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKP = BlockchainKeyGenerator.getInstance().generate(); | |||||
| ; | ; | ||||
| UserAccount userAccount = ldgDS.getUserAccountSet().register(userKP.getAddress(), userKP.getPubKey()); | UserAccount userAccount = ldgDS.getUserAccountSet().register(userKP.getAddress(), userKP.getPubKey()); | ||||
| userAccount.setProperty("Name", "孙悟空", -1); | userAccount.setProperty("Name", "孙悟空", -1); | ||||
| @@ -122,7 +122,7 @@ public class LedgerManagerTest { | |||||
| LedgerEditor editor1 = reloadLedgerRepo.createNextBlock(); | LedgerEditor editor1 = reloadLedgerRepo.createNextBlock(); | ||||
| TxBuilder txBuilder = new TxBuilder(ledgerHash); | TxBuilder txBuilder = new TxBuilder(ledgerHash); | ||||
| BlockchainKeyPair dataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| txBuilder.dataAccounts().register(dataKey.getIdentity()); | txBuilder.dataAccounts().register(dataKey.getIdentity()); | ||||
| TransactionRequestBuilder txReqBuilder = txBuilder.prepareRequest(); | TransactionRequestBuilder txReqBuilder = txBuilder.prepareRequest(); | ||||
| DigitalSignature dgtsign = txReqBuilder.signAsEndpoint(userKP); | DigitalSignature dgtsign = txReqBuilder.signAsEndpoint(userKP); | ||||
+ 2
- 2
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerTransactionDataTest.java
View File
| @@ -23,7 +23,7 @@ import com.jd.blockchain.crypto.PubKey; | |||||
| import com.jd.blockchain.crypto.SignatureDigest; | import com.jd.blockchain.crypto.SignatureDigest; | ||||
| import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | import com.jd.blockchain.crypto.service.classic.ClassicCryptoService; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DataAccountKVSetOperation; | import com.jd.blockchain.ledger.DataAccountKVSetOperation; | ||||
| import com.jd.blockchain.ledger.DigitalSignature; | import com.jd.blockchain.ledger.DigitalSignature; | ||||
| import com.jd.blockchain.ledger.EndpointRequest; | import com.jd.blockchain.ledger.EndpointRequest; | ||||
| @@ -252,7 +252,7 @@ public class LedgerTransactionDataTest { | |||||
| private TransactionContent initTransactionContent() throws Exception { | private TransactionContent initTransactionContent() throws Exception { | ||||
| TxContentBlob contentBlob = null; | TxContentBlob contentBlob = null; | ||||
| BlockchainKeyPair id = BlockchainKeyGenerator.getInstance().generate(ClassicCryptoService.ED25519_ALGORITHM); | |||||
| BlockchainKeypair id = BlockchainKeyGenerator.getInstance().generate(ClassicCryptoService.ED25519_ALGORITHM); | |||||
| HashDigest ledgerHash = CryptoServiceProviders.getHashFunction("SHA256") | HashDigest ledgerHash = CryptoServiceProviders.getHashFunction("SHA256") | ||||
| .hash(UUID.randomUUID().toString().getBytes("UTF-8")); | .hash(UUID.randomUUID().toString().getBytes("UTF-8")); | ||||
| BlockchainOperationFactory opFactory = new BlockchainOperationFactory(); | BlockchainOperationFactory opFactory = new BlockchainOperationFactory(); | ||||
+ 6
- 6
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TransactionSetTest.java
View File
| @@ -15,7 +15,7 @@ import com.jd.blockchain.crypto.HashDigest; | |||||
| import org.junit.Test; | import org.junit.Test; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.ContractCodeDeployOperation; | import com.jd.blockchain.ledger.ContractCodeDeployOperation; | ||||
| import com.jd.blockchain.ledger.ContractEventSendOperation; | import com.jd.blockchain.ledger.ContractEventSendOperation; | ||||
| import com.jd.blockchain.ledger.CryptoSetting; | import com.jd.blockchain.ledger.CryptoSetting; | ||||
| @@ -64,10 +64,10 @@ public class TransactionSetTest { | |||||
| HashDigest ledgerHash = LedgerTestUtils.generateRandomHash(); | HashDigest ledgerHash = LedgerTestUtils.generateRandomHash(); | ||||
| TransactionBuilder txBuilder = new TxBuilder(ledgerHash); | TransactionBuilder txBuilder = new TxBuilder(ledgerHash); | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| UserRegisterOperation userRegOp = txBuilder.users().register(userKey.getIdentity()); | UserRegisterOperation userRegOp = txBuilder.users().register(userKey.getIdentity()); | ||||
| BlockchainKeyPair dataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| DataAccountRegisterOperation dataAccRegOp = txBuilder.dataAccounts().register(dataKey.getIdentity()); | DataAccountRegisterOperation dataAccRegOp = txBuilder.dataAccounts().register(dataKey.getIdentity()); | ||||
| DataAccountKVSetOperation kvsetOP = txBuilder.dataAccount(dataKey.getAddress()) | DataAccountKVSetOperation kvsetOP = txBuilder.dataAccount(dataKey.getAddress()) | ||||
| @@ -75,7 +75,7 @@ public class TransactionSetTest { | |||||
| byte[] chainCode = new byte[128]; | byte[] chainCode = new byte[128]; | ||||
| rand.nextBytes(chainCode); | rand.nextBytes(chainCode); | ||||
| BlockchainKeyPair contractKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| ContractCodeDeployOperation contractDplOP = txBuilder.contracts().deploy(contractKey.getIdentity(), chainCode); | ContractCodeDeployOperation contractDplOP = txBuilder.contracts().deploy(contractKey.getIdentity(), chainCode); | ||||
| ContractEventSendOperation contractEvtSendOP = txBuilder.contractEvents().send(contractKey.getAddress(), "test", | ContractEventSendOperation contractEvtSendOP = txBuilder.contractEvents().send(contractKey.getAddress(), "test", | ||||
| @@ -83,9 +83,9 @@ public class TransactionSetTest { | |||||
| TransactionRequestBuilder txReqBuilder = txBuilder.prepareRequest(); | TransactionRequestBuilder txReqBuilder = txBuilder.prepareRequest(); | ||||
| BlockchainKeyPair sponsorKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair sponsorKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| txReqBuilder.signAsEndpoint(sponsorKey); | txReqBuilder.signAsEndpoint(sponsorKey); | ||||
| BlockchainKeyPair gatewayKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair gatewayKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| txReqBuilder.signAsNode(gatewayKey); | txReqBuilder.signAsNode(gatewayKey); | ||||
| TransactionRequest txReq = txReqBuilder.buildRequest(); | TransactionRequest txReq = txReqBuilder.buildRequest(); | ||||
+ 4
- 4
source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainKeyGenerator.java
View File
| @@ -22,19 +22,19 @@ public class BlockchainKeyGenerator { | |||||
| return new BlockchainKeyGenerator(); | return new BlockchainKeyGenerator(); | ||||
| } | } | ||||
| public BlockchainKeyPair generate() { | |||||
| public BlockchainKeypair generate() { | |||||
| return generate(DEFAULT_ALGORITHM); | return generate(DEFAULT_ALGORITHM); | ||||
| } | } | ||||
| public BlockchainKeyPair generate(String algorithmName) { | |||||
| public BlockchainKeypair generate(String algorithmName) { | |||||
| CryptoAlgorithm algorithm = CryptoServiceProviders.getAlgorithm(algorithmName); | CryptoAlgorithm algorithm = CryptoServiceProviders.getAlgorithm(algorithmName); | ||||
| return generate(algorithm); | return generate(algorithm); | ||||
| } | } | ||||
| public BlockchainKeyPair generate(CryptoAlgorithm signatureAlgorithm) { | |||||
| public BlockchainKeypair generate(CryptoAlgorithm signatureAlgorithm) { | |||||
| SignatureFunction signFunc = CryptoServiceProviders.getSignatureFunction(signatureAlgorithm); | SignatureFunction signFunc = CryptoServiceProviders.getSignatureFunction(signatureAlgorithm); | ||||
| AsymmetricKeypair cryptoKeyPair = signFunc.generateKeypair(); | AsymmetricKeypair cryptoKeyPair = signFunc.generateKeypair(); | ||||
| return new BlockchainKeyPair(cryptoKeyPair.getPubKey(), cryptoKeyPair.getPrivKey()); | |||||
| return new BlockchainKeypair(cryptoKeyPair.getPubKey(), cryptoKeyPair.getPrivKey()); | |||||
| } | } | ||||
| } | } | ||||
source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainKeyPair.java → source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainKeypair.java
View File
| @@ -11,7 +11,7 @@ import com.jd.blockchain.utils.Bytes; | |||||
| * @author huanghaiquan | * @author huanghaiquan | ||||
| * | * | ||||
| */ | */ | ||||
| public class BlockchainKeyPair extends AsymmetricKeypair { | |||||
| public class BlockchainKeypair extends AsymmetricKeypair { | |||||
| private BlockchainIdentity id; | private BlockchainIdentity id; | ||||
| @@ -20,7 +20,7 @@ public class BlockchainKeyPair extends AsymmetricKeypair { | |||||
| // privKey = new PrivKey(algorithm, privKeyBytes.bytes()); | // privKey = new PrivKey(algorithm, privKeyBytes.bytes()); | ||||
| // } | // } | ||||
| public BlockchainKeyPair(String address, PubKey pubKey, PrivKey privKey) { | |||||
| public BlockchainKeypair(String address, PubKey pubKey, PrivKey privKey) { | |||||
| super(pubKey, privKey); | super(pubKey, privKey); | ||||
| if (pubKey.getAlgorithm() != privKey.getAlgorithm()) { | if (pubKey.getAlgorithm() != privKey.getAlgorithm()) { | ||||
| throw new IllegalArgumentException("The PublicKey's algorithm is different from the PrivateKey's!"); | throw new IllegalArgumentException("The PublicKey's algorithm is different from the PrivateKey's!"); | ||||
| @@ -28,7 +28,7 @@ public class BlockchainKeyPair extends AsymmetricKeypair { | |||||
| this.id = new BlockchainIdentityData(Bytes.fromBase58(address), pubKey); | this.id = new BlockchainIdentityData(Bytes.fromBase58(address), pubKey); | ||||
| } | } | ||||
| public BlockchainKeyPair(PubKey pubKey, PrivKey privKey) { | |||||
| public BlockchainKeypair(PubKey pubKey, PrivKey privKey) { | |||||
| super(pubKey, privKey); | super(pubKey, privKey); | ||||
| if (pubKey.getAlgorithm() != privKey.getAlgorithm()) { | if (pubKey.getAlgorithm() != privKey.getAlgorithm()) { | ||||
| throw new IllegalArgumentException("The PublicKey's algorithm is different from the PrivateKey's!"); | throw new IllegalArgumentException("The PublicKey's algorithm is different from the PrivateKey's!"); | ||||
+ 2
- 2
source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/AddressEncodingTest.java
View File
| @@ -5,12 +5,12 @@ import java.util.Random; | |||||
| import com.jd.blockchain.crypto.AddressEncoding; | import com.jd.blockchain.crypto.AddressEncoding; | ||||
| import com.jd.blockchain.crypto.PubKey; | import com.jd.blockchain.crypto.PubKey; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| public class AddressEncodingTest { | public class AddressEncodingTest { | ||||
| public static void main(String[] args) { | public static void main(String[] args) { | ||||
| BlockchainKeyPair bkp = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair bkp = BlockchainKeyGenerator.getInstance().generate(); | |||||
| PubKey pk = bkp.getPubKey(); | PubKey pk = bkp.getPubKey(); | ||||
| byte[] data =new byte[64]; | byte[] data =new byte[64]; | ||||
| Random rand = new Random(); | Random rand = new Random(); | ||||
+ 2
- 2
source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxContentBlobTest.java
View File
| @@ -14,7 +14,7 @@ import com.jd.blockchain.binaryproto.DataContractRegistry; | |||||
| import com.jd.blockchain.crypto.CryptoServiceProviders; | import com.jd.blockchain.crypto.CryptoServiceProviders; | ||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DataAccountKVSetOperation; | import com.jd.blockchain.ledger.DataAccountKVSetOperation; | ||||
| import com.jd.blockchain.ledger.HashObject; | import com.jd.blockchain.ledger.HashObject; | ||||
| import com.jd.blockchain.ledger.Operation; | import com.jd.blockchain.ledger.Operation; | ||||
| @@ -34,7 +34,7 @@ public class TxContentBlobTest { | |||||
| DataContractRegistry.register(TransactionContent.class); | DataContractRegistry.register(TransactionContent.class); | ||||
| DataContractRegistry.register(HashObject.class); | DataContractRegistry.register(HashObject.class); | ||||
| BlockchainKeyPair id = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| BlockchainKeypair id = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| HashDigest ledgerHash = CryptoServiceProviders.getHashFunction("SHA256") | HashDigest ledgerHash = CryptoServiceProviders.getHashFunction("SHA256") | ||||
| .hash(UUID.randomUUID().toString().getBytes("UTF-8")); | .hash(UUID.randomUUID().toString().getBytes("UTF-8")); | ||||
+ 2
- 2
source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/data/TxRequestMessageTest.java
View File
| @@ -24,7 +24,7 @@ import com.jd.blockchain.crypto.HashFunction; | |||||
| import com.jd.blockchain.crypto.SignatureDigest; | import com.jd.blockchain.crypto.SignatureDigest; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DataAccountKVSetOperation; | import com.jd.blockchain.ledger.DataAccountKVSetOperation; | ||||
| import com.jd.blockchain.ledger.DigitalSignature; | import com.jd.blockchain.ledger.DigitalSignature; | ||||
| import com.jd.blockchain.ledger.EndpointRequest; | import com.jd.blockchain.ledger.EndpointRequest; | ||||
| @@ -195,7 +195,7 @@ public class TxRequestMessageTest { | |||||
| private TransactionContent initTransactionContent() throws Exception { | private TransactionContent initTransactionContent() throws Exception { | ||||
| TxContentBlob contentBlob = null; | TxContentBlob contentBlob = null; | ||||
| BlockchainKeyPair id = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| BlockchainKeypair id = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| HashFunction hashFunc = CryptoServiceProviders.getHashFunction("SHA256"); | HashFunction hashFunc = CryptoServiceProviders.getHashFunction("SHA256"); | ||||
| HashDigest ledgerHash = hashFunc.hash(UUID.randomUUID().toString().getBytes("UTF-8")); | HashDigest ledgerHash = hashFunc.hash(UUID.randomUUID().toString().getBytes("UTF-8")); | ||||
| BlockchainOperationFactory opFactory = new BlockchainOperationFactory(); | BlockchainOperationFactory opFactory = new BlockchainOperationFactory(); | ||||
+ 7
- 7
source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java
View File
| @@ -7,7 +7,7 @@ import com.jd.blockchain.crypto.CryptoServiceProviders; | |||||
| import com.jd.blockchain.crypto.PrivKey; | import com.jd.blockchain.crypto.PrivKey; | ||||
| import com.jd.blockchain.crypto.SignatureDigest; | import com.jd.blockchain.crypto.SignatureDigest; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DigitalSignature; | import com.jd.blockchain.ledger.DigitalSignature; | ||||
| import com.jd.blockchain.ledger.TransactionContent; | import com.jd.blockchain.ledger.TransactionContent; | ||||
| import com.jd.blockchain.ledger.TransactionRequest; | import com.jd.blockchain.ledger.TransactionRequest; | ||||
| @@ -29,11 +29,11 @@ public class GatewayServiceFactory implements BlockchainServiceFactory, Closeabl | |||||
| private ServiceConnectionManager httpConnectionManager; | private ServiceConnectionManager httpConnectionManager; | ||||
| private BlockchainKeyPair userKey; | |||||
| private BlockchainKeypair userKey; | |||||
| private BlockchainService blockchainService; | private BlockchainService blockchainService; | ||||
| protected GatewayServiceFactory(ServiceEndpoint gatewayEndpoint, BlockchainKeyPair userKey) { | |||||
| protected GatewayServiceFactory(ServiceEndpoint gatewayEndpoint, BlockchainKeypair userKey) { | |||||
| httpConnectionManager = new ServiceConnectionManager(); | httpConnectionManager = new ServiceConnectionManager(); | ||||
| this.userKey = userKey; | this.userKey = userKey; | ||||
| @@ -73,7 +73,7 @@ public class GatewayServiceFactory implements BlockchainServiceFactory, Closeabl | |||||
| return connect(gatewayAddress.getHost(), gatewayAddress.getPort(), gatewayAddress.isSecure(), null); | return connect(gatewayAddress.getHost(), gatewayAddress.getPort(), gatewayAddress.isSecure(), null); | ||||
| } | } | ||||
| public static GatewayServiceFactory connect(NetworkAddress gatewayAddress, BlockchainKeyPair userKey) { | |||||
| public static GatewayServiceFactory connect(NetworkAddress gatewayAddress, BlockchainKeypair userKey) { | |||||
| return connect(gatewayAddress.getHost(), gatewayAddress.getPort(), gatewayAddress.isSecure(), userKey); | return connect(gatewayAddress.getHost(), gatewayAddress.getPort(), gatewayAddress.isSecure(), userKey); | ||||
| } | } | ||||
| @@ -82,7 +82,7 @@ public class GatewayServiceFactory implements BlockchainServiceFactory, Closeabl | |||||
| } | } | ||||
| public static GatewayServiceFactory connect(String gatewayHost, int gatewayPort, boolean secure, | public static GatewayServiceFactory connect(String gatewayHost, int gatewayPort, boolean secure, | ||||
| BlockchainKeyPair userKey) { | |||||
| BlockchainKeypair userKey) { | |||||
| // if (userKey == null) { | // if (userKey == null) { | ||||
| // throw new IllegalArgumentException("User key is null!"); | // throw new IllegalArgumentException("User key is null!"); | ||||
| // } | // } | ||||
| @@ -122,9 +122,9 @@ public class GatewayServiceFactory implements BlockchainServiceFactory, Closeabl | |||||
| private TransactionService innerService; | private TransactionService innerService; | ||||
| private BlockchainKeyPair userKey; | |||||
| private BlockchainKeypair userKey; | |||||
| public EndpointAutoSigner(TransactionService innerService, BlockchainKeyPair userKey) { | |||||
| public EndpointAutoSigner(TransactionService innerService, BlockchainKeypair userKey) { | |||||
| this.innerService = innerService; | this.innerService = innerService; | ||||
| this.userKey = userKey; | this.userKey = userKey; | ||||
| } | } | ||||
+ 2
- 2
source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Contract.java
View File
| @@ -5,7 +5,7 @@ import com.jd.blockchain.crypto.CryptoServiceProviders; | |||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| import com.jd.blockchain.ledger.TransactionTemplate; | import com.jd.blockchain.ledger.TransactionTemplate; | ||||
| import com.jd.blockchain.sdk.BlockchainService; | import com.jd.blockchain.sdk.BlockchainService; | ||||
| @@ -22,7 +22,7 @@ import com.jd.blockchain.utils.serialize.json.JSONSerializeUtils; | |||||
| */ | */ | ||||
| public class SDKDemo_Contract { | public class SDKDemo_Contract { | ||||
| public static BlockchainKeyPair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| public static BlockchainKeypair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| /** | /** | ||||
| * 演示合约执行的过程； | * 演示合约执行的过程； | ||||
+ 3
- 3
source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_DataAccount.java
View File
| @@ -5,7 +5,7 @@ import com.jd.blockchain.crypto.CryptoServiceProviders; | |||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| import com.jd.blockchain.ledger.TransactionTemplate; | import com.jd.blockchain.ledger.TransactionTemplate; | ||||
| import com.jd.blockchain.sdk.BlockchainTransactionService; | import com.jd.blockchain.sdk.BlockchainTransactionService; | ||||
| @@ -14,7 +14,7 @@ import com.jd.blockchain.utils.net.NetworkAddress; | |||||
| public class SDKDemo_DataAccount { | public class SDKDemo_DataAccount { | ||||
| public static BlockchainKeyPair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| public static BlockchainKeypair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| /** | /** | ||||
| @@ -51,7 +51,7 @@ public class SDKDemo_DataAccount { | |||||
| // 在本地产生要注册的账户的秘钥； | // 在本地产生要注册的账户的秘钥； | ||||
| BlockchainKeyGenerator generator = BlockchainKeyGenerator.getInstance(); | BlockchainKeyGenerator generator = BlockchainKeyGenerator.getInstance(); | ||||
| BlockchainKeyPair dataAccount = generator.generate("ED25519"); | |||||
| BlockchainKeypair dataAccount = generator.generate("ED25519"); | |||||
| txTemp.dataAccounts().register(dataAccount.getIdentity()); | txTemp.dataAccounts().register(dataAccount.getIdentity()); | ||||
+ 2
- 2
source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_InsertData.java
View File
| @@ -5,7 +5,7 @@ import com.jd.blockchain.crypto.CryptoServiceProviders; | |||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| import com.jd.blockchain.ledger.TransactionTemplate; | import com.jd.blockchain.ledger.TransactionTemplate; | ||||
| import com.jd.blockchain.sdk.BlockchainService; | import com.jd.blockchain.sdk.BlockchainService; | ||||
| @@ -21,7 +21,7 @@ import com.jd.blockchain.utils.net.NetworkAddress; | |||||
| */ | */ | ||||
| public class SDKDemo_InsertData { | public class SDKDemo_InsertData { | ||||
| public static BlockchainKeyPair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| public static BlockchainKeypair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| /** | /** | ||||
+ 2
- 2
source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Query.java
View File
| @@ -3,7 +3,7 @@ package com.jd.blockchain.sdk.samples; | |||||
| import com.jd.blockchain.crypto.CryptoServiceProviders; | import com.jd.blockchain.crypto.CryptoServiceProviders; | ||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.KVDataEntry; | import com.jd.blockchain.ledger.KVDataEntry; | ||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| import com.jd.blockchain.ledger.LedgerTransaction; | import com.jd.blockchain.ledger.LedgerTransaction; | ||||
| @@ -20,7 +20,7 @@ import com.jd.blockchain.utils.net.NetworkAddress; | |||||
| */ | */ | ||||
| public class SDKDemo_Query { | public class SDKDemo_Query { | ||||
| public static BlockchainKeyPair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| public static BlockchainKeypair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate("ED25519"); | |||||
| public static final HashDigest LEDGER_HASH = CryptoServiceProviders.getHashFunction("SHA256") | public static final HashDigest LEDGER_HASH = CryptoServiceProviders.getHashFunction("SHA256") | ||||
| .hash("xkxjcioewfqwe".getBytes()); | .hash("xkxjcioewfqwe".getBytes()); | ||||
+ 3
- 3
source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterAccount.java
View File
| @@ -26,7 +26,7 @@ public class SDKDemo_RegisterAccount { | |||||
| DataContractRegistry.register(EndpointRequest.class); | DataContractRegistry.register(EndpointRequest.class); | ||||
| DataContractRegistry.register(TransactionResponse.class); | DataContractRegistry.register(TransactionResponse.class); | ||||
| BlockchainKeyPair CLIENT_CERT = new BlockchainKeyPair(SDKDemo_Params.pubKey0, SDKDemo_Params.privkey0); | |||||
| BlockchainKeypair CLIENT_CERT = new BlockchainKeypair(SDKDemo_Params.pubKey0, SDKDemo_Params.privkey0); | |||||
| boolean SECURE = false; | boolean SECURE = false; | ||||
| GatewayServiceFactory serviceFactory = GatewayServiceFactory.connect(GATEWAY_IPADDR, GATEWAY_PORT, SECURE, | GatewayServiceFactory serviceFactory = GatewayServiceFactory.connect(GATEWAY_IPADDR, GATEWAY_PORT, SECURE, | ||||
| CLIENT_CERT); | CLIENT_CERT); | ||||
| @@ -37,9 +37,9 @@ public class SDKDemo_RegisterAccount { | |||||
| TransactionTemplate txTemp = service.newTransaction(ledgerHashs[0]); | TransactionTemplate txTemp = service.newTransaction(ledgerHashs[0]); | ||||
| //existed signer | //existed signer | ||||
| AsymmetricKeypair keyPair = new BlockchainKeyPair(SDKDemo_Params.pubKey1, SDKDemo_Params.privkey1); | |||||
| AsymmetricKeypair keyPair = new BlockchainKeypair(SDKDemo_Params.pubKey1, SDKDemo_Params.privkey1); | |||||
| BlockchainKeyPair dataAcount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataAcount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 注册 | // 注册 | ||||
| txTemp.dataAccounts().register(dataAcount.getIdentity()); | txTemp.dataAccounts().register(dataAcount.getIdentity()); | ||||
+ 3
- 3
source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegisterUser.java
View File
| @@ -46,7 +46,7 @@ public class SDKDemo_RegisterUser { | |||||
| PrivKey privKey = SDKDemo_Params.privkey1; | PrivKey privKey = SDKDemo_Params.privkey1; | ||||
| PubKey pubKey = SDKDemo_Params.pubKey1; | PubKey pubKey = SDKDemo_Params.pubKey1; | ||||
| BlockchainKeyPair CLIENT_CERT = new BlockchainKeyPair(SDKDemo_Params.pubKey0, SDKDemo_Params.privkey0); | |||||
| BlockchainKeypair CLIENT_CERT = new BlockchainKeypair(SDKDemo_Params.pubKey0, SDKDemo_Params.privkey0); | |||||
| boolean SECURE = false; | boolean SECURE = false; | ||||
| GatewayServiceFactory serviceFactory = GatewayServiceFactory.connect(GATEWAY_IPADDR, GATEWAY_PORT, SECURE, | GatewayServiceFactory serviceFactory = GatewayServiceFactory.connect(GATEWAY_IPADDR, GATEWAY_PORT, SECURE, | ||||
| @@ -58,9 +58,9 @@ public class SDKDemo_RegisterUser { | |||||
| TransactionTemplate txTemp = service.newTransaction(ledgerHashs[0]); | TransactionTemplate txTemp = service.newTransaction(ledgerHashs[0]); | ||||
| //existed signer | //existed signer | ||||
| AsymmetricKeypair keyPair = new BlockchainKeyPair(pubKey, privKey); | |||||
| AsymmetricKeypair keyPair = new BlockchainKeypair(pubKey, privKey); | |||||
| BlockchainKeyPair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 注册 | // 注册 | ||||
| txTemp.users().register(user.getIdentity()); | txTemp.users().register(user.getIdentity()); | ||||
+ 3
- 3
source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_User.java
View File
| @@ -5,7 +5,7 @@ import com.jd.blockchain.crypto.CryptoServiceProviders; | |||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| import com.jd.blockchain.ledger.TransactionTemplate; | import com.jd.blockchain.ledger.TransactionTemplate; | ||||
| import com.jd.blockchain.sdk.BlockchainTransactionService; | import com.jd.blockchain.sdk.BlockchainTransactionService; | ||||
| @@ -14,7 +14,7 @@ import com.jd.blockchain.utils.net.NetworkAddress; | |||||
| public class SDKDemo_User { | public class SDKDemo_User { | ||||
| public static BlockchainKeyPair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate(); | |||||
| public static BlockchainKeypair CLIENT_CERT = BlockchainKeyGenerator.getInstance().generate(); | |||||
| /** | /** | ||||
| * 生成一个区块链用户，并注册到区块链； | * 生成一个区块链用户，并注册到区块链； | ||||
| @@ -65,7 +65,7 @@ public class SDKDemo_User { | |||||
| SignatureFunction signatureFunction = CryptoServiceProviders.getSignatureFunction("ED25519"); | SignatureFunction signatureFunction = CryptoServiceProviders.getSignatureFunction("ED25519"); | ||||
| AsymmetricKeypair cryptoKeyPair = signatureFunction.generateKeypair(); | AsymmetricKeypair cryptoKeyPair = signatureFunction.generateKeypair(); | ||||
| BlockchainKeyPair user = new BlockchainKeyPair(cryptoKeyPair.getPubKey(), cryptoKeyPair.getPrivKey()); | |||||
| BlockchainKeypair user = new BlockchainKeypair(cryptoKeyPair.getPubKey(), cryptoKeyPair.getPrivKey()); | |||||
| txTemp.users().register(user.getIdentity()); | txTemp.users().register(user.getIdentity()); | ||||
+ 2
- 2
source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_BatchInsertData_Test_.java
View File
| @@ -20,7 +20,7 @@ import com.jd.blockchain.crypto.HashDigest; | |||||
| import com.jd.blockchain.crypto.HashFunction; | import com.jd.blockchain.crypto.HashFunction; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.EndpointRequest; | import com.jd.blockchain.ledger.EndpointRequest; | ||||
| import com.jd.blockchain.ledger.NodeRequest; | import com.jd.blockchain.ledger.NodeRequest; | ||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| @@ -46,7 +46,7 @@ public class SDK_GateWay_BatchInsertData_Test_ { | |||||
| String ledgerHash = ""; | String ledgerHash = ""; | ||||
| private BlockchainKeyPair CLIENT_CERT = null; | |||||
| private BlockchainKeypair CLIENT_CERT = null; | |||||
| private String GATEWAY_IPADDR = null; | private String GATEWAY_IPADDR = null; | ||||
+ 5
- 5
source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_DataAccount_Test_.java
View File
| @@ -18,7 +18,7 @@ import com.jd.blockchain.crypto.HashDigest; | |||||
| import com.jd.blockchain.crypto.HashFunction; | import com.jd.blockchain.crypto.HashFunction; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.EndpointRequest; | import com.jd.blockchain.ledger.EndpointRequest; | ||||
| import com.jd.blockchain.ledger.NodeRequest; | import com.jd.blockchain.ledger.NodeRequest; | ||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| @@ -41,7 +41,7 @@ import com.jd.blockchain.sdk.client.GatewayServiceFactory; | |||||
| public class SDK_GateWay_DataAccount_Test_ { | public class SDK_GateWay_DataAccount_Test_ { | ||||
| private BlockchainKeyPair CLIENT_CERT = null; | |||||
| private BlockchainKeypair CLIENT_CERT = null; | |||||
| private String GATEWAY_IPADDR = null; | private String GATEWAY_IPADDR = null; | ||||
| @@ -53,7 +53,7 @@ public class SDK_GateWay_DataAccount_Test_ { | |||||
| @Before | @Before | ||||
| public void init() { | public void init() { | ||||
| CLIENT_CERT = new BlockchainKeyPair(SDK_GateWay_KeyPair_Para.pubKey0, SDK_GateWay_KeyPair_Para.privkey0); | |||||
| CLIENT_CERT = new BlockchainKeypair(SDK_GateWay_KeyPair_Para.pubKey0, SDK_GateWay_KeyPair_Para.privkey0); | |||||
| GATEWAY_IPADDR = "127.0.0.1"; | GATEWAY_IPADDR = "127.0.0.1"; | ||||
| GATEWAY_PORT = 8081; | GATEWAY_PORT = 8081; | ||||
| SECURE = false; | SECURE = false; | ||||
| @@ -81,9 +81,9 @@ public class SDK_GateWay_DataAccount_Test_ { | |||||
| // CryptoKeyPair cryptoKeyPair = signatureFunction.generateKeyPair(); | // CryptoKeyPair cryptoKeyPair = signatureFunction.generateKeyPair(); | ||||
| //existed signer | //existed signer | ||||
| AsymmetricKeypair keyPair = new BlockchainKeyPair(SDK_GateWay_KeyPair_Para.pubKey1, SDK_GateWay_KeyPair_Para.privkey1); | |||||
| AsymmetricKeypair keyPair = new BlockchainKeypair(SDK_GateWay_KeyPair_Para.pubKey1, SDK_GateWay_KeyPair_Para.privkey1); | |||||
| BlockchainKeyPair dataAcount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataAcount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 注册 | // 注册 | ||||
| txTemp.dataAccounts().register(dataAcount.getIdentity()); | txTemp.dataAccounts().register(dataAcount.getIdentity()); | ||||
+ 2
- 2
source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_InsertData_Test_.java
View File
| @@ -20,7 +20,7 @@ import com.jd.blockchain.crypto.HashDigest; | |||||
| import com.jd.blockchain.crypto.HashFunction; | import com.jd.blockchain.crypto.HashFunction; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.EndpointRequest; | import com.jd.blockchain.ledger.EndpointRequest; | ||||
| import com.jd.blockchain.ledger.NodeRequest; | import com.jd.blockchain.ledger.NodeRequest; | ||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| @@ -43,7 +43,7 @@ import com.jd.blockchain.sdk.client.GatewayServiceFactory; | |||||
| public class SDK_GateWay_InsertData_Test_ { | public class SDK_GateWay_InsertData_Test_ { | ||||
| private BlockchainKeyPair CLIENT_CERT = null; | |||||
| private BlockchainKeypair CLIENT_CERT = null; | |||||
| private String GATEWAY_IPADDR = null; | private String GATEWAY_IPADDR = null; | ||||
+ 4
- 4
source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Query_Test_.java
View File
| @@ -23,7 +23,7 @@ import com.jd.blockchain.crypto.serialize.ByteArrayObjectDeserializer; | |||||
| import com.jd.blockchain.crypto.serialize.ByteArrayObjectSerializer; | import com.jd.blockchain.crypto.serialize.ByteArrayObjectSerializer; | ||||
| import com.jd.blockchain.ledger.AccountHeader; | import com.jd.blockchain.ledger.AccountHeader; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DigitalSignature; | import com.jd.blockchain.ledger.DigitalSignature; | ||||
| import com.jd.blockchain.ledger.EndpointRequest; | import com.jd.blockchain.ledger.EndpointRequest; | ||||
| import com.jd.blockchain.ledger.KVDataEntry; | import com.jd.blockchain.ledger.KVDataEntry; | ||||
| @@ -64,7 +64,7 @@ public class SDK_GateWay_Query_Test_ { | |||||
| } | } | ||||
| } | } | ||||
| private BlockchainKeyPair CLIENT_CERT = null; | |||||
| private BlockchainKeypair CLIENT_CERT = null; | |||||
| private String GATEWAY_IPADDR = null; | private String GATEWAY_IPADDR = null; | ||||
| @@ -184,10 +184,10 @@ public class SDK_GateWay_Query_Test_ { | |||||
| return CryptoServiceProviders.getSignatureFunction("ED25519"); | return CryptoServiceProviders.getSignatureFunction("ED25519"); | ||||
| } | } | ||||
| private BlockchainKeyPair getSponsorKey() { | |||||
| private BlockchainKeypair getSponsorKey() { | |||||
| SignatureFunction signatureFunction = getSignatureFunction(); | SignatureFunction signatureFunction = getSignatureFunction(); | ||||
| AsymmetricKeypair cryptoKeyPair = signatureFunction.generateKeypair(); | AsymmetricKeypair cryptoKeyPair = signatureFunction.generateKeypair(); | ||||
| BlockchainKeyPair blockchainKeyPair = new BlockchainKeyPair(cryptoKeyPair.getPubKey(), | |||||
| BlockchainKeypair blockchainKeyPair = new BlockchainKeypair(cryptoKeyPair.getPubKey(), | |||||
| cryptoKeyPair.getPrivKey()); | cryptoKeyPair.getPrivKey()); | ||||
| return blockchainKeyPair; | return blockchainKeyPair; | ||||
| } | } | ||||
+ 5
- 5
source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_User_Test_.java
View File
| @@ -22,7 +22,7 @@ import com.jd.blockchain.crypto.PrivKey; | |||||
| import com.jd.blockchain.crypto.PubKey; | import com.jd.blockchain.crypto.PubKey; | ||||
| import com.jd.blockchain.crypto.SignatureFunction; | import com.jd.blockchain.crypto.SignatureFunction; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.EndpointRequest; | import com.jd.blockchain.ledger.EndpointRequest; | ||||
| import com.jd.blockchain.ledger.NodeRequest; | import com.jd.blockchain.ledger.NodeRequest; | ||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| @@ -54,7 +54,7 @@ public class SDK_GateWay_User_Test_ { | |||||
| private PrivKey privKey; | private PrivKey privKey; | ||||
| private PubKey pubKey; | private PubKey pubKey; | ||||
| private BlockchainKeyPair CLIENT_CERT = null; | |||||
| private BlockchainKeypair CLIENT_CERT = null; | |||||
| private String GATEWAY_IPADDR = null; | private String GATEWAY_IPADDR = null; | ||||
| @@ -80,7 +80,7 @@ public class SDK_GateWay_User_Test_ { | |||||
| privKey = SDK_GateWay_KeyPair_Para.privkey1; | privKey = SDK_GateWay_KeyPair_Para.privkey1; | ||||
| pubKey = SDK_GateWay_KeyPair_Para.pubKey1; | pubKey = SDK_GateWay_KeyPair_Para.pubKey1; | ||||
| CLIENT_CERT = new BlockchainKeyPair(SDK_GateWay_KeyPair_Para.pubKey0, SDK_GateWay_KeyPair_Para.privkey0); | |||||
| CLIENT_CERT = new BlockchainKeypair(SDK_GateWay_KeyPair_Para.pubKey0, SDK_GateWay_KeyPair_Para.privkey0); | |||||
| GATEWAY_IPADDR = "127.0.0.1"; | GATEWAY_IPADDR = "127.0.0.1"; | ||||
| GATEWAY_PORT = 8081; | GATEWAY_PORT = 8081; | ||||
| SECURE = false; | SECURE = false; | ||||
| @@ -103,9 +103,9 @@ public class SDK_GateWay_User_Test_ { | |||||
| TransactionTemplate txTemp = service.newTransaction(ledgerHashs[0]); | TransactionTemplate txTemp = service.newTransaction(ledgerHashs[0]); | ||||
| //existed signer | //existed signer | ||||
| AsymmetricKeypair keyPair = new BlockchainKeyPair(pubKey, privKey); | |||||
| AsymmetricKeypair keyPair = new BlockchainKeypair(pubKey, privKey); | |||||
| BlockchainKeyPair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 注册 | // 注册 | ||||
| txTemp.users().register(user.getIdentity()); | txTemp.users().register(user.getIdentity()); | ||||
+ 11
- 11
source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.java
View File
| @@ -22,7 +22,7 @@ import com.jd.blockchain.crypto.PubKey; | |||||
| import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | ||||
| import com.jd.blockchain.ledger.AccountHeader; | import com.jd.blockchain.ledger.AccountHeader; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DataAccountKVSetOperation; | import com.jd.blockchain.ledger.DataAccountKVSetOperation; | ||||
| import com.jd.blockchain.ledger.KVDataEntry; | import com.jd.blockchain.ledger.KVDataEntry; | ||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| @@ -54,8 +54,8 @@ import test.com.jd.blockchain.intgr.perf.LedgerInitializeWebTest; | |||||
| public class IntegrationTest { | public class IntegrationTest { | ||||
| // 合约测试使用的初始化数据; | // 合约测试使用的初始化数据; | ||||
| BlockchainKeyPair contractDataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeyPair contractDeployKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractDataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractDeployKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| private String contractZipName = "AssetContract1.contract"; | private String contractZipName = "AssetContract1.contract"; | ||||
| private String eventName = "issue-asset"; | private String eventName = "issue-asset"; | ||||
| HashDigest txContentHash; | HashDigest txContentHash; | ||||
| @@ -171,7 +171,7 @@ public class IntegrationTest { | |||||
| AsymmetricKeypair adminKey = context.getNode(0).getPartiKeyPair(); | AsymmetricKeypair adminKey = context.getNode(0).getPartiKeyPair(); | ||||
| BlockchainKeyPair newUserAcount = testSDK_RegisterUser(adminKey, ledgerHashs[0], bcsrv, context); | |||||
| BlockchainKeypair newUserAcount = testSDK_RegisterUser(adminKey, ledgerHashs[0], bcsrv, context); | |||||
| // BlockchainKeyPair newDataAccount = testSDK_RegisterDataAccount(adminKey, | // BlockchainKeyPair newDataAccount = testSDK_RegisterDataAccount(adminKey, | ||||
| // ledgerHashs[0], bcsrv, context); | // ledgerHashs[0], bcsrv, context); | ||||
| @@ -223,10 +223,10 @@ public class IntegrationTest { | |||||
| } | } | ||||
| } | } | ||||
| private static BlockchainKeyPair testSDK_RegisterUser(AsymmetricKeypair adminKey, HashDigest ledgerHash, | |||||
| private static BlockchainKeypair testSDK_RegisterUser(AsymmetricKeypair adminKey, HashDigest ledgerHash, | |||||
| BlockchainService blockchainService, IntegratedContext context) { | BlockchainService blockchainService, IntegratedContext context) { | ||||
| // 注册用户，并验证最终写入； | // 注册用户，并验证最终写入； | ||||
| BlockchainKeyPair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 定义交易； | // 定义交易； | ||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | ||||
| @@ -253,10 +253,10 @@ public class IntegrationTest { | |||||
| return user; | return user; | ||||
| } | } | ||||
| private BlockchainKeyPair testSDK_RegisterDataAccount(AsymmetricKeypair adminKey, HashDigest ledgerHash, | |||||
| private BlockchainKeypair testSDK_RegisterDataAccount(AsymmetricKeypair adminKey, HashDigest ledgerHash, | |||||
| BlockchainService blockchainService, IntegratedContext context) { | BlockchainService blockchainService, IntegratedContext context) { | ||||
| // 注册数据账户，并验证最终写入； | // 注册数据账户，并验证最终写入； | ||||
| BlockchainKeyPair dataAccount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataAccount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 定义交易； | // 定义交易； | ||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | ||||
| @@ -287,7 +287,7 @@ public class IntegrationTest { | |||||
| } | } | ||||
| private void testSDK_Query(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService, | private void testSDK_Query(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService, | ||||
| IntegratedContext context, BlockchainKeyPair newUserAcount, BlockchainKeyPair newDataAcount) { | |||||
| IntegratedContext context, BlockchainKeypair newUserAcount, BlockchainKeypair newDataAcount) { | |||||
| Bytes userAddress = newUserAcount.getAddress(); | Bytes userAddress = newUserAcount.getAddress(); | ||||
| Bytes dataAddress = newDataAcount.getAddress(); | Bytes dataAddress = newDataAcount.getAddress(); | ||||
| @@ -552,7 +552,7 @@ public class IntegrationTest { | |||||
| // valid the basic data in contract; | // valid the basic data in contract; | ||||
| prepareContractData(adminKey, ledgerHash, blockchainService, context); | prepareContractData(adminKey, ledgerHash, blockchainService, context); | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 定义交易； | // 定义交易； | ||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | ||||
| @@ -585,7 +585,7 @@ public class IntegrationTest { | |||||
| return block; | return block; | ||||
| } | } | ||||
| private void testContractExe(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainKeyPair userKey, | |||||
| private void testContractExe(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainKeypair userKey, | |||||
| BlockchainService blockchainService, IntegratedContext context) { | BlockchainService blockchainService, IntegratedContext context) { | ||||
| LedgerInfo ledgerInfo = blockchainService.getLedger(ledgerHash); | LedgerInfo ledgerInfo = blockchainService.getLedger(ledgerHash); | ||||
| LedgerBlock previousBlock = blockchainService.getBlock(ledgerHash, ledgerInfo.getLatestBlockHeight() - 1); | LedgerBlock previousBlock = blockchainService.getBlock(ledgerHash, ledgerInfo.getLatestBlockHeight() - 1); | ||||
+ 5
- 5
source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/consensus/ConsensusTest.java
View File
| @@ -20,7 +20,7 @@ import com.jd.blockchain.crypto.PrivKey; | |||||
| import com.jd.blockchain.crypto.SignatureDigest; | import com.jd.blockchain.crypto.SignatureDigest; | ||||
| import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| import com.jd.blockchain.ledger.TransactionContent; | import com.jd.blockchain.ledger.TransactionContent; | ||||
| @@ -115,7 +115,7 @@ public class ConsensusTest { | |||||
| BlockchainService blockchainService = gwsrvFact.getBlockchainService(); | BlockchainService blockchainService = gwsrvFact.getBlockchainService(); | ||||
| int batchSize = CONCURRENT_USER_COUNT * USER_TX_COUNT; | int batchSize = CONCURRENT_USER_COUNT * USER_TX_COUNT; | ||||
| BlockchainKeyPair[] keys = generateKeys(batchSize); | |||||
| BlockchainKeypair[] keys = generateKeys(batchSize); | |||||
| HashDigest ledgerHash = node0.getLedgerManager().getLedgerHashs()[0]; | HashDigest ledgerHash = node0.getLedgerManager().getLedgerHashs()[0]; | ||||
| LedgerRepository ledger = node0.getLedgerManager().getLedger(ledgerHash); | LedgerRepository ledger = node0.getLedgerManager().getLedger(ledgerHash); | ||||
| @@ -153,15 +153,15 @@ public class ConsensusTest { | |||||
| elapsedTs, (batchSize * 1000.00D / elapsedTs)); | elapsedTs, (batchSize * 1000.00D / elapsedTs)); | ||||
| } | } | ||||
| private static BlockchainKeyPair[] generateKeys(int count) { | |||||
| BlockchainKeyPair[] keys = new BlockchainKeyPair[count]; | |||||
| private static BlockchainKeypair[] generateKeys(int count) { | |||||
| BlockchainKeypair[] keys = new BlockchainKeypair[count]; | |||||
| for (int i = 0; i < count; i++) { | for (int i = 0; i < count; i++) { | ||||
| keys[i] = BlockchainKeyGenerator.getInstance().generate(); | keys[i] = BlockchainKeyGenerator.getInstance().generate(); | ||||
| } | } | ||||
| return keys; | return keys; | ||||
| } | } | ||||
| private static PreparedTransaction[] prepareTransactions_RegisterDataAcount(BlockchainKeyPair[] userKeys, | |||||
| private static PreparedTransaction[] prepareTransactions_RegisterDataAcount(BlockchainKeypair[] userKeys, | |||||
| AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService) { | AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService) { | ||||
| PreparedTransaction[] ptxs = new PreparedTransaction[userKeys.length]; | PreparedTransaction[] ptxs = new PreparedTransaction[userKeys.length]; | ||||
| for (int i = 0; i < ptxs.length; i++) { | for (int i = 0; i < ptxs.length; i++) { | ||||
+ 5
- 5
source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/GlobalPerformanceTest.java
View File
| @@ -22,7 +22,7 @@ import com.jd.blockchain.crypto.PrivKey; | |||||
| import com.jd.blockchain.crypto.SignatureDigest; | import com.jd.blockchain.crypto.SignatureDigest; | ||||
| import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| import com.jd.blockchain.ledger.TransactionContent; | import com.jd.blockchain.ledger.TransactionContent; | ||||
| @@ -113,7 +113,7 @@ public class GlobalPerformanceTest { | |||||
| BlockchainService blockchainService = gwsrvFact.getBlockchainService(); | BlockchainService blockchainService = gwsrvFact.getBlockchainService(); | ||||
| int batchSize = CONCURRENT_USER_COUNT * USER_TX_COUNT; | int batchSize = CONCURRENT_USER_COUNT * USER_TX_COUNT; | ||||
| BlockchainKeyPair[] keys = generateKeys(batchSize); | |||||
| BlockchainKeypair[] keys = generateKeys(batchSize); | |||||
| HashDigest ledgerHash = node0.getLedgerManager().getLedgerHashs()[0]; | HashDigest ledgerHash = node0.getLedgerManager().getLedgerHashs()[0]; | ||||
| LedgerRepository ledger = node0.getLedgerManager().getLedger(ledgerHash); | LedgerRepository ledger = node0.getLedgerManager().getLedger(ledgerHash); | ||||
| @@ -151,15 +151,15 @@ public class GlobalPerformanceTest { | |||||
| elapsedTs, (batchSize * 1000.00D / elapsedTs)); | elapsedTs, (batchSize * 1000.00D / elapsedTs)); | ||||
| } | } | ||||
| private static BlockchainKeyPair[] generateKeys(int count) { | |||||
| BlockchainKeyPair[] keys = new BlockchainKeyPair[count]; | |||||
| private static BlockchainKeypair[] generateKeys(int count) { | |||||
| BlockchainKeypair[] keys = new BlockchainKeypair[count]; | |||||
| for (int i = 0; i < count; i++) { | for (int i = 0; i < count; i++) { | ||||
| keys[i] = BlockchainKeyGenerator.getInstance().generate(); | keys[i] = BlockchainKeyGenerator.getInstance().generate(); | ||||
| } | } | ||||
| return keys; | return keys; | ||||
| } | } | ||||
| private static PreparedTransaction[] prepareTransactions_RegisterDataAcount(BlockchainKeyPair[] userKeys, | |||||
| private static PreparedTransaction[] prepareTransactions_RegisterDataAcount(BlockchainKeypair[] userKeys, | |||||
| AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService) { | AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService) { | ||||
| PreparedTransaction[] ptxs = new PreparedTransaction[userKeys.length]; | PreparedTransaction[] ptxs = new PreparedTransaction[userKeys.length]; | ||||
| for (int i = 0; i < ptxs.length; i++) { | for (int i = 0; i < ptxs.length; i++) { | ||||
+ 5
- 5
source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java
View File
| @@ -23,7 +23,7 @@ import com.jd.blockchain.crypto.HashDigest; | |||||
| import com.jd.blockchain.crypto.PrivKey; | import com.jd.blockchain.crypto.PrivKey; | ||||
| import com.jd.blockchain.ledger.BlockchainIdentity; | import com.jd.blockchain.ledger.BlockchainIdentity; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DataAccountKVSetOperation; | import com.jd.blockchain.ledger.DataAccountKVSetOperation; | ||||
| import com.jd.blockchain.ledger.DataAccountRegisterOperation; | import com.jd.blockchain.ledger.DataAccountRegisterOperation; | ||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| @@ -361,7 +361,7 @@ public class LedgerPerformanceTest { | |||||
| List<TransactionRequest> txList = new ArrayList<>(); | List<TransactionRequest> txList = new ArrayList<>(); | ||||
| for (int i = 0; i < count; i++) { | for (int i = 0; i < count; i++) { | ||||
| TxBuilder txbuilder = new TxBuilder(ledgerHash); | TxBuilder txbuilder = new TxBuilder(ledgerHash); | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| txbuilder.users().register(userKey.getIdentity()); | txbuilder.users().register(userKey.getIdentity()); | ||||
| TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | ||||
| reqBuilder.signAsEndpoint(adminKey); | reqBuilder.signAsEndpoint(adminKey); | ||||
| @@ -382,7 +382,7 @@ public class LedgerPerformanceTest { | |||||
| List<TransactionRequest> txList = new ArrayList<>(); | List<TransactionRequest> txList = new ArrayList<>(); | ||||
| for (int i = 0; i < count; i++) { | for (int i = 0; i < count; i++) { | ||||
| TxBuilder txbuilder = new TxBuilder(ledgerHash); | TxBuilder txbuilder = new TxBuilder(ledgerHash); | ||||
| BlockchainKeyPair dataAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| dataAccounts[i] = dataAccountKey.getIdentity(); | dataAccounts[i] = dataAccountKey.getIdentity(); | ||||
| txbuilder.dataAccounts().register(dataAccounts[i]); | txbuilder.dataAccounts().register(dataAccounts[i]); | ||||
| TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | ||||
| @@ -442,12 +442,12 @@ public class LedgerPerformanceTest { | |||||
| return null; | return null; | ||||
| } | } | ||||
| TxBuilder txbuilder = new TxBuilder(ledgerHash); | TxBuilder txbuilder = new TxBuilder(ledgerHash); | ||||
| BlockchainKeyPair contractAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainIdentity contractIdentity = contractAccountKey.getIdentity(); | BlockchainIdentity contractIdentity = contractAccountKey.getIdentity(); | ||||
| txbuilder.contracts().deploy(contractIdentity, chainCode); | txbuilder.contracts().deploy(contractIdentity, chainCode); | ||||
| // create data account | // create data account | ||||
| BlockchainKeyPair dataAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainIdentity dataIdentity = dataAccountKey.getIdentity(); | BlockchainIdentity dataIdentity = dataAccountKey.getIdentity(); | ||||
| txbuilder.dataAccounts().register(dataIdentity); | txbuilder.dataAccounts().register(dataIdentity); | ||||
+ 10
- 10
source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java
View File
| @@ -75,7 +75,7 @@ public class IntegrationBase { | |||||
| public static KeyPairResponse testSDK_RegisterUser(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService) { | public static KeyPairResponse testSDK_RegisterUser(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService) { | ||||
| // 注册用户，并验证最终写入； | // 注册用户，并验证最终写入； | ||||
| BlockchainKeyPair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 定义交易； | // 定义交易； | ||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | ||||
| @@ -100,7 +100,7 @@ public class IntegrationBase { | |||||
| public static KeyPairResponse testSDK_RegisterDataAccount(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService) { | public static KeyPairResponse testSDK_RegisterDataAccount(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainService blockchainService) { | ||||
| // 注册数据账户，并验证最终写入； | // 注册数据账户，并验证最终写入； | ||||
| BlockchainKeyPair dataAccount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataAccount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 定义交易； | // 定义交易； | ||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | ||||
| @@ -163,7 +163,7 @@ public class IntegrationBase { | |||||
| public static void validKeyPair(IntegrationBase.KeyPairResponse keyPairResponse, LedgerRepository ledgerRepository, KeyPairType keyPairType) { | public static void validKeyPair(IntegrationBase.KeyPairResponse keyPairResponse, LedgerRepository ledgerRepository, KeyPairType keyPairType) { | ||||
| TransactionResponse txResp = keyPairResponse.txResp; | TransactionResponse txResp = keyPairResponse.txResp; | ||||
| HashDigest transactionHash = keyPairResponse.txHash; | HashDigest transactionHash = keyPairResponse.txHash; | ||||
| BlockchainKeyPair keyPair = keyPairResponse.keyPair; | |||||
| BlockchainKeypair keyPair = keyPairResponse.keyPair; | |||||
| long index = validLong.incrementAndGet(); | long index = validLong.incrementAndGet(); | ||||
| System.out.printf("validKeyPair start %s \r\n", index); | System.out.printf("validKeyPair start %s \r\n", index); | ||||
| ledgerRepository.retrieveLatestBlock(); | ledgerRepository.retrieveLatestBlock(); | ||||
| @@ -187,7 +187,7 @@ public class IntegrationBase { | |||||
| TransactionResponse txResp = keyPairResponse.txResp; | TransactionResponse txResp = keyPairResponse.txResp; | ||||
| HashDigest transactionHash = keyPairResponse.txHash; | HashDigest transactionHash = keyPairResponse.txHash; | ||||
| BlockchainKeyPair keyPair = keyPairResponse.keyPair; | |||||
| BlockchainKeypair keyPair = keyPairResponse.keyPair; | |||||
| ledgerRepository.retrieveLatestBlock(); | ledgerRepository.retrieveLatestBlock(); | ||||
| assertEquals(txResp.getExecutionState(), TransactionState.SUCCESS); | assertEquals(txResp.getExecutionState(), TransactionState.SUCCESS); | ||||
| @@ -368,11 +368,11 @@ public class IntegrationBase { | |||||
| public static class KeyPairResponse { | public static class KeyPairResponse { | ||||
| HashDigest txHash; | HashDigest txHash; | ||||
| BlockchainKeyPair keyPair; | |||||
| BlockchainKeypair keyPair; | |||||
| TransactionResponse txResp; | TransactionResponse txResp; | ||||
| public BlockchainKeyPair getKeyPair() { | |||||
| public BlockchainKeypair getKeyPair() { | |||||
| return keyPair; | return keyPair; | ||||
| } | } | ||||
| @@ -430,8 +430,8 @@ public class IntegrationBase { | |||||
| } | } | ||||
| // 合约测试使用的初始化数据; | // 合约测试使用的初始化数据; | ||||
| BlockchainKeyPair contractDataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeyPair contractDeployKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractDataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractDeployKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 保存资产总数的键； | // 保存资产总数的键； | ||||
| private static final String KEY_TOTAL = "TOTAL"; | private static final String KEY_TOTAL = "TOTAL"; | ||||
| // 第二个参数; | // 第二个参数; | ||||
| @@ -443,7 +443,7 @@ public class IntegrationBase { | |||||
| public LedgerBlock testSDK_Contract(AsymmetricKeypair adminKey, HashDigest ledgerHash, | public LedgerBlock testSDK_Contract(AsymmetricKeypair adminKey, HashDigest ledgerHash, | ||||
| BlockchainService blockchainService,LedgerRepository ledgerRepository) { | BlockchainService blockchainService,LedgerRepository ledgerRepository) { | ||||
| System.out.println("adminKey="+ AddressEncoding.generateAddress(adminKey.getPubKey())); | System.out.println("adminKey="+ AddressEncoding.generateAddress(adminKey.getPubKey())); | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| System.out.println("userKey="+userKey.getAddress()); | System.out.println("userKey="+userKey.getAddress()); | ||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | ||||
| txTpl.users().register(userKey.getIdentity()); | txTpl.users().register(userKey.getIdentity()); | ||||
| @@ -475,7 +475,7 @@ public class IntegrationBase { | |||||
| return block; | return block; | ||||
| } | } | ||||
| private void testContractExe(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainKeyPair userKey, | |||||
| private void testContractExe(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainKeypair userKey, | |||||
| BlockchainService blockchainService,LedgerRepository ledgerRepository) { | BlockchainService blockchainService,LedgerRepository ledgerRepository) { | ||||
| LedgerInfo ledgerInfo = blockchainService.getLedger(ledgerHash); | LedgerInfo ledgerInfo = blockchainService.getLedger(ledgerHash); | ||||
| LedgerBlock previousBlock = blockchainService.getBlock(ledgerHash, ledgerInfo.getLatestBlockHeight() - 1); | LedgerBlock previousBlock = blockchainService.getBlock(ledgerHash, ledgerInfo.getLatestBlockHeight() - 1); | ||||
+ 4
- 4
source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTest2.java
View File
| @@ -23,7 +23,7 @@ import com.jd.blockchain.crypto.HashDigest; | |||||
| import com.jd.blockchain.crypto.PrivKey; | import com.jd.blockchain.crypto.PrivKey; | ||||
| import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| import com.jd.blockchain.ledger.LedgerInfo; | import com.jd.blockchain.ledger.LedgerInfo; | ||||
| import com.jd.blockchain.ledger.PreparedTransaction; | import com.jd.blockchain.ledger.PreparedTransaction; | ||||
| @@ -49,7 +49,7 @@ import test.com.jd.blockchain.intgr.initializer.LedgerInitializeWeb4SingleStepsT | |||||
| */ | */ | ||||
| public class IntegrationTest2 { | public class IntegrationTest2 { | ||||
| // 合约测试使用的初始化数据; | // 合约测试使用的初始化数据; | ||||
| BlockchainKeyPair contractDeployKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractDeployKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| private String contractZipName = "AssetContract3.contract"; | private String contractZipName = "AssetContract3.contract"; | ||||
| private String eventName = "issue-asset"; | private String eventName = "issue-asset"; | ||||
| @@ -287,7 +287,7 @@ public class IntegrationTest2 { | |||||
| private void testSDK_Contract(AsymmetricKeypair adminKey, HashDigest ledgerHash, | private void testSDK_Contract(AsymmetricKeypair adminKey, HashDigest ledgerHash, | ||||
| BlockchainService blockchainService, IntegratedContext context) { | BlockchainService blockchainService, IntegratedContext context) { | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 定义交易； | // 定义交易； | ||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | ||||
| @@ -307,7 +307,7 @@ public class IntegrationTest2 { | |||||
| testContractExe(adminKey, ledgerHash, userKey, blockchainService, context); | testContractExe(adminKey, ledgerHash, userKey, blockchainService, context); | ||||
| } | } | ||||
| private void testContractExe(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainKeyPair userKey, | |||||
| private void testContractExe(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainKeypair userKey, | |||||
| BlockchainService blockchainService, IntegratedContext context) { | BlockchainService blockchainService, IntegratedContext context) { | ||||
| LedgerInfo ledgerInfo = blockchainService.getLedger(ledgerHash); | LedgerInfo ledgerInfo = blockchainService.getLedger(ledgerHash); | ||||
| LedgerBlock previousBlock = blockchainService.getBlock(ledgerHash, ledgerInfo.getLatestBlockHeight()-1); | LedgerBlock previousBlock = blockchainService.getBlock(ledgerHash, ledgerInfo.getLatestBlockHeight()-1); | ||||
+ 2
- 2
source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTest4Bftsmart.java
View File
| @@ -5,7 +5,7 @@ import com.jd.blockchain.crypto.HashDigest; | |||||
| import com.jd.blockchain.crypto.PrivKey; | import com.jd.blockchain.crypto.PrivKey; | ||||
| import com.jd.blockchain.crypto.PubKey; | import com.jd.blockchain.crypto.PubKey; | ||||
| import com.jd.blockchain.gateway.GatewayConfigProperties; | import com.jd.blockchain.gateway.GatewayConfigProperties; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.core.LedgerRepository; | import com.jd.blockchain.ledger.core.LedgerRepository; | ||||
| import com.jd.blockchain.sdk.BlockchainService; | import com.jd.blockchain.sdk.BlockchainService; | ||||
| import com.jd.blockchain.sdk.client.GatewayServiceFactory; | import com.jd.blockchain.sdk.client.GatewayServiceFactory; | ||||
| @@ -132,7 +132,7 @@ public class IntegrationTest4Bftsmart { | |||||
| validKeyPair(dataAccountResponse, ledgerRepository, IntegrationBase.KeyPairType.DATAACCOUNT); | validKeyPair(dataAccountResponse, ledgerRepository, IntegrationBase.KeyPairType.DATAACCOUNT); | ||||
| if (isWriteKv) { | if (isWriteKv) { | ||||
| BlockchainKeyPair da = dataAccountResponse.keyPair; | |||||
| BlockchainKeypair da = dataAccountResponse.keyPair; | |||||
| IntegrationBase.KvResponse kvResponse = IntegrationBase.testSDK_InsertData(adminKey, ledgerHash, blockchainService, da.getAddress()); | IntegrationBase.KvResponse kvResponse = IntegrationBase.testSDK_InsertData(adminKey, ledgerHash, blockchainService, da.getAddress()); | ||||
| validKvWrite(kvResponse, ledgerRepository, blockchainService); | validKvWrite(kvResponse, ledgerRepository, blockchainService); | ||||
| } | } | ||||
+ 1
- 1
source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTest4MQ.java
View File
| @@ -127,7 +127,7 @@ public class IntegrationTest4MQ { | |||||
| validKeyPair(dataAccountResponse, ledgerRepository, IntegrationBase.KeyPairType.DATAACCOUNT); | validKeyPair(dataAccountResponse, ledgerRepository, IntegrationBase.KeyPairType.DATAACCOUNT); | ||||
| if (isWriteKv) { | if (isWriteKv) { | ||||
| BlockchainKeyPair da = dataAccountResponse.keyPair; | |||||
| BlockchainKeypair da = dataAccountResponse.keyPair; | |||||
| IntegrationBase.KvResponse kvResponse = IntegrationBase.testSDK_InsertData(adminKey, ledgerHash, blockchainService, da.getAddress()); | IntegrationBase.KvResponse kvResponse = IntegrationBase.testSDK_InsertData(adminKey, ledgerHash, blockchainService, da.getAddress()); | ||||
| validKvWrite(kvResponse, ledgerRepository, blockchainService); | validKvWrite(kvResponse, ledgerRepository, blockchainService); | ||||
| } | } | ||||
+ 13
- 13
source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTestAll4Redis.java
View File
| @@ -22,7 +22,7 @@ import com.jd.blockchain.crypto.PrivKey; | |||||
| import com.jd.blockchain.crypto.PubKey; | import com.jd.blockchain.crypto.PubKey; | ||||
| import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DataAccountKVSetOperation; | import com.jd.blockchain.ledger.DataAccountKVSetOperation; | ||||
| import com.jd.blockchain.ledger.KVDataEntry; | import com.jd.blockchain.ledger.KVDataEntry; | ||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| @@ -66,12 +66,12 @@ public class IntegrationTestAll4Redis { | |||||
| "177gk2VtYeGbK5TS2xWhbSZA4BsT9Xj5Fb8hqCzxzgbojVVcqaDSFFrFPsLbZBx7rszyCNy" }; | "177gk2VtYeGbK5TS2xWhbSZA4BsT9Xj5Fb8hqCzxzgbojVVcqaDSFFrFPsLbZBx7rszyCNy" }; | ||||
| // batch transactions keys | // batch transactions keys | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeyPair dataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 合约测试使用的初始化数据; | // 合约测试使用的初始化数据; | ||||
| BlockchainKeyPair contractDataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeyPair contractDeployKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractDataKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair contractDeployKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| private String contractZipName = "AssetContract1.contract"; | private String contractZipName = "AssetContract1.contract"; | ||||
| private String eventName = "issue-asset"; | private String eventName = "issue-asset"; | ||||
| HashDigest txContentHash; | HashDigest txContentHash; | ||||
| @@ -263,8 +263,8 @@ public class IntegrationTestAll4Redis { | |||||
| BlockchainService bcsrv = gwsrvFact.getBlockchainService(); | BlockchainService bcsrv = gwsrvFact.getBlockchainService(); | ||||
| HashDigest[] ledgerHashs = bcsrv.getLedgerHashs(); | HashDigest[] ledgerHashs = bcsrv.getLedgerHashs(); | ||||
| BlockchainKeyPair newUserAcount = testSDK_RegisterUser(adminKey, ledgerHashs[0], bcsrv, ledgerRepository); | |||||
| BlockchainKeyPair newDataAccount = testSDK_RegisterDataAccount(adminKey, ledgerHashs[0], bcsrv, | |||||
| BlockchainKeypair newUserAcount = testSDK_RegisterUser(adminKey, ledgerHashs[0], bcsrv, ledgerRepository); | |||||
| BlockchainKeypair newDataAccount = testSDK_RegisterDataAccount(adminKey, ledgerHashs[0], bcsrv, | |||||
| ledgerRepository); | ledgerRepository); | ||||
| testSDK_InsertData(adminKey, ledgerHashs[0], bcsrv, newDataAccount.getAddress(), ledgerRepository); | testSDK_InsertData(adminKey, ledgerHashs[0], bcsrv, newDataAccount.getAddress(), ledgerRepository); | ||||
| LedgerBlock latestBlock = testSDK_Contract(adminKey, ledgerHashs[0], bcsrv, ledgerRepository); | LedgerBlock latestBlock = testSDK_Contract(adminKey, ledgerHashs[0], bcsrv, ledgerRepository); | ||||
| @@ -315,10 +315,10 @@ public class IntegrationTestAll4Redis { | |||||
| } | } | ||||
| } | } | ||||
| private BlockchainKeyPair testSDK_RegisterDataAccount(AsymmetricKeypair adminKey, HashDigest ledgerHash, | |||||
| private BlockchainKeypair testSDK_RegisterDataAccount(AsymmetricKeypair adminKey, HashDigest ledgerHash, | |||||
| BlockchainService blockchainService, LedgerRepository ledgerRepository) { | BlockchainService blockchainService, LedgerRepository ledgerRepository) { | ||||
| // 注册数据账户，并验证最终写入； | // 注册数据账户，并验证最终写入； | ||||
| BlockchainKeyPair dataAccount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataAccount = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 定义交易； | // 定义交易； | ||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | ||||
| @@ -350,10 +350,10 @@ public class IntegrationTestAll4Redis { | |||||
| return dataAccount; | return dataAccount; | ||||
| } | } | ||||
| private BlockchainKeyPair testSDK_RegisterUser(AsymmetricKeypair adminKey, HashDigest ledgerHash, | |||||
| private BlockchainKeypair testSDK_RegisterUser(AsymmetricKeypair adminKey, HashDigest ledgerHash, | |||||
| BlockchainService blockchainService, LedgerRepository ledgerRepository) { | BlockchainService blockchainService, LedgerRepository ledgerRepository) { | ||||
| // 注册用户，并验证最终写入； | // 注册用户，并验证最终写入； | ||||
| BlockchainKeyPair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair user = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // 定义交易； | // 定义交易； | ||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); | ||||
| @@ -393,7 +393,7 @@ public class IntegrationTestAll4Redis { | |||||
| private LedgerBlock testSDK_Contract(AsymmetricKeypair adminKey, HashDigest ledgerHash, | private LedgerBlock testSDK_Contract(AsymmetricKeypair adminKey, HashDigest ledgerHash, | ||||
| BlockchainService blockchainService, LedgerRepository ledgerRepository) { | BlockchainService blockchainService, LedgerRepository ledgerRepository) { | ||||
| System.out.println("adminKey=" + AddressEncoding.generateAddress(adminKey.getPubKey())); | System.out.println("adminKey=" + AddressEncoding.generateAddress(adminKey.getPubKey())); | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| System.out.println("userKey=" + userKey.getAddress()); | System.out.println("userKey=" + userKey.getAddress()); | ||||
| // valid the basic data in contract; | // valid the basic data in contract; | ||||
| // prepareContractData(adminKey, ledgerHash, | // prepareContractData(adminKey, ledgerHash, | ||||
| @@ -442,7 +442,7 @@ public class IntegrationTestAll4Redis { | |||||
| return block; | return block; | ||||
| } | } | ||||
| private void testContractExe(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainKeyPair userKey, | |||||
| private void testContractExe(AsymmetricKeypair adminKey, HashDigest ledgerHash, BlockchainKeypair userKey, | |||||
| BlockchainService blockchainService, LedgerRepository ledgerRepository) { | BlockchainService blockchainService, LedgerRepository ledgerRepository) { | ||||
| LedgerInfo ledgerInfo = blockchainService.getLedger(ledgerHash); | LedgerInfo ledgerInfo = blockchainService.getLedger(ledgerHash); | ||||
| LedgerBlock previousBlock = blockchainService.getBlock(ledgerHash, ledgerInfo.getLatestBlockHeight() - 1); | LedgerBlock previousBlock = blockchainService.getBlock(ledgerHash, ledgerInfo.getLatestBlockHeight() - 1); | ||||
+ 2
- 2
source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTestDataAccount.java
View File
| @@ -22,7 +22,7 @@ import com.jd.blockchain.crypto.PrivKey; | |||||
| import com.jd.blockchain.crypto.PubKey; | import com.jd.blockchain.crypto.PubKey; | ||||
| import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.DataAccountKVSetOperation; | import com.jd.blockchain.ledger.DataAccountKVSetOperation; | ||||
| import com.jd.blockchain.ledger.KVDataEntry; | import com.jd.blockchain.ledger.KVDataEntry; | ||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| @@ -147,7 +147,7 @@ public class IntegrationTestDataAccount { | |||||
| TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHashs[0]); | TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHashs[0]); | ||||
| // BlockchainKeyPair user = BlockchainKeyGenerator.getInstance().generate(); | // BlockchainKeyPair user = BlockchainKeyGenerator.getInstance().generate(); | ||||
| BlockchainKeyPair data = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair data = BlockchainKeyGenerator.getInstance().generate(); | |||||
| // regist user account | // regist user account | ||||
| // txTpl.users().register(user.getIdentity()); | // txTpl.users().register(user.getIdentity()); | ||||
+ 1
- 1
source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/batch/bftsmart/BftsmartLedgerInit.java
View File
| @@ -13,7 +13,7 @@ import com.jd.blockchain.crypto.HashDigest; | |||||
| import com.jd.blockchain.crypto.PrivKey; | import com.jd.blockchain.crypto.PrivKey; | ||||
| import com.jd.blockchain.crypto.PubKey; | import com.jd.blockchain.crypto.PubKey; | ||||
| import com.jd.blockchain.gateway.GatewayConfigProperties; | import com.jd.blockchain.gateway.GatewayConfigProperties; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.core.LedgerRepository; | import com.jd.blockchain.ledger.core.LedgerRepository; | ||||
| import com.jd.blockchain.peer.PeerServerBooter; | import com.jd.blockchain.peer.PeerServerBooter; | ||||
| import com.jd.blockchain.sdk.BlockchainService; | import com.jd.blockchain.sdk.BlockchainService; | ||||
+ 2
- 2
source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/ledger/LedgerBlockGeneratingTest.java
View File
| @@ -20,7 +20,7 @@ import com.jd.blockchain.crypto.AsymmetricKeypair; | |||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.crypto.PrivKey; | import com.jd.blockchain.crypto.PrivKey; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.LedgerBlock; | import com.jd.blockchain.ledger.LedgerBlock; | ||||
| import com.jd.blockchain.ledger.TransactionRequest; | import com.jd.blockchain.ledger.TransactionRequest; | ||||
| import com.jd.blockchain.ledger.TransactionRequestBuilder; | import com.jd.blockchain.ledger.TransactionRequestBuilder; | ||||
| @@ -110,7 +110,7 @@ public class LedgerBlockGeneratingTest { | |||||
| List<TransactionRequest> txList = new ArrayList<>(); | List<TransactionRequest> txList = new ArrayList<>(); | ||||
| for (int i = 0; i < count; i++) { | for (int i = 0; i < count; i++) { | ||||
| TxBuilder txbuilder = new TxBuilder(ledgerHash); | TxBuilder txbuilder = new TxBuilder(ledgerHash); | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| txbuilder.users().register(userKey.getIdentity()); | txbuilder.users().register(userKey.getIdentity()); | ||||
| TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | ||||
| reqBuilder.signAsEndpoint(adminKey); | reqBuilder.signAsEndpoint(adminKey); | ||||
+ 4
- 4
source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/RemoteTransactionService.java
View File
| @@ -25,7 +25,7 @@ import com.jd.blockchain.crypto.AsymmetricKeypair; | |||||
| import com.jd.blockchain.crypto.HashDigest; | import com.jd.blockchain.crypto.HashDigest; | ||||
| import com.jd.blockchain.ledger.BlockchainIdentity; | import com.jd.blockchain.ledger.BlockchainIdentity; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyGenerator; | import com.jd.blockchain.ledger.BlockchainKeyGenerator; | ||||
| import com.jd.blockchain.ledger.BlockchainKeyPair; | |||||
| import com.jd.blockchain.ledger.BlockchainKeypair; | |||||
| import com.jd.blockchain.ledger.TransactionRequest; | import com.jd.blockchain.ledger.TransactionRequest; | ||||
| import com.jd.blockchain.ledger.TransactionRequestBuilder; | import com.jd.blockchain.ledger.TransactionRequestBuilder; | ||||
| import com.jd.blockchain.ledger.data.TxBuilder; | import com.jd.blockchain.ledger.data.TxBuilder; | ||||
| @@ -319,7 +319,7 @@ public class RemoteTransactionService { | |||||
| private TransactionRequest userRegisterRequest(HashDigest ledgerHash, AsymmetricKeypair adminKey) { | private TransactionRequest userRegisterRequest(HashDigest ledgerHash, AsymmetricKeypair adminKey) { | ||||
| TxBuilder txbuilder = new TxBuilder(ledgerHash); | TxBuilder txbuilder = new TxBuilder(ledgerHash); | ||||
| BlockchainKeyPair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair userKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| txbuilder.users().register(userKey.getIdentity()); | txbuilder.users().register(userKey.getIdentity()); | ||||
| TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | ||||
| reqBuilder.signAsEndpoint(adminKey); | reqBuilder.signAsEndpoint(adminKey); | ||||
| @@ -328,7 +328,7 @@ public class RemoteTransactionService { | |||||
| private TransactionRequest dataAccountRegisterRequest(HashDigest ledgerHash, AsymmetricKeypair adminKey, boolean isSave) { | private TransactionRequest dataAccountRegisterRequest(HashDigest ledgerHash, AsymmetricKeypair adminKey, boolean isSave) { | ||||
| TxBuilder txbuilder = new TxBuilder(ledgerHash); | TxBuilder txbuilder = new TxBuilder(ledgerHash); | ||||
| BlockchainKeyPair dataAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainIdentity identity = dataAccountKey.getIdentity(); | BlockchainIdentity identity = dataAccountKey.getIdentity(); | ||||
| txbuilder.dataAccounts().register(identity); | txbuilder.dataAccounts().register(identity); | ||||
| TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | ||||
| @@ -341,7 +341,7 @@ public class RemoteTransactionService { | |||||
| private TransactionRequest dataAccountRegisterRequest(HashDigest ledgerHash, AsymmetricKeypair adminKey) { | private TransactionRequest dataAccountRegisterRequest(HashDigest ledgerHash, AsymmetricKeypair adminKey) { | ||||
| TxBuilder txbuilder = new TxBuilder(ledgerHash); | TxBuilder txbuilder = new TxBuilder(ledgerHash); | ||||
| BlockchainKeyPair dataAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainKeypair dataAccountKey = BlockchainKeyGenerator.getInstance().generate(); | |||||
| BlockchainIdentity identity = dataAccountKey.getIdentity(); | BlockchainIdentity identity = dataAccountKey.getIdentity(); | ||||
| txbuilder.dataAccounts().register(identity); | txbuilder.dataAccounts().register(identity); | ||||
| TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | TransactionRequestBuilder reqBuilder = txbuilder.prepareRequest(); | ||||