From 6f46dc0c0353d902041397086aabb1fb912d6541 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Fri, 17 Jul 2020 15:14:48 +0800 Subject: [PATCH 1/2] modify sdk test example --- samples/pom.xml | 2 +- .../com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java | 6 ++++++ .../com/jd/blockchain/sdk/samples/SDKDemo_RegistParticipant.java | 5 +---- .../com/jd/blockchain/sdk/samples/SDK_RegistParticipant_Demo.java | 6 +----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/samples/pom.xml b/samples/pom.xml index ba6abb2e..ab981eb5 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -15,7 +15,7 @@ pom - 1.2.0.RELEASE + 1.3.0.RELEASE diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java index a00e8fb3..1624cc92 100644 --- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java +++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java @@ -38,7 +38,13 @@ public class SDKDemo_ActiveParticipant { // 账本值根据具体情况进行修改 BasicNameValuePair base58LedgerHash = new BasicNameValuePair("ledgerHash", "j5n3SmYT3rS5aDgwQbDUxBYUMEP9GvVfMiQK3Tcr3vxz3M"); + // 激活的新参与方的共识网络地址 + BasicNameValuePair host = new BasicNameValuePair("host", "127.0.0.1"); + BasicNameValuePair port = new BasicNameValuePair("port", "20000"); + para.add(base58LedgerHash); + para.add(host); + para.add(port); try { httpPost.setEntity(new UrlEncodedFormEntity(para,"UTF-8")); diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegistParticipant.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegistParticipant.java index dea45458..fa956312 100644 --- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegistParticipant.java +++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_RegistParticipant.java @@ -67,11 +67,8 @@ public class SDKDemo_RegistParticipant { BlockchainKeypair user = new BlockchainKeypair(pubKey, privKey); - // 新参与方的共识网络地址 - NetworkAddress networkAddress = new NetworkAddress("127.0.0.1", 20000); - // 注册参与方 - txTemp.participants().register("Peer4", user.getIdentity(), networkAddress); + txTemp.participants().register("Peer4", user.getIdentity()); // TX 准备就绪； PreparedTransaction prepTx = txTemp.prepare(); diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_RegistParticipant_Demo.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_RegistParticipant_Demo.java index 4f880311..ea81ac09 100644 --- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_RegistParticipant_Demo.java +++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_RegistParticipant_Demo.java @@ -5,7 +5,6 @@ import com.jd.blockchain.crypto.KeyGenUtils; import com.jd.blockchain.crypto.PrivKey; import com.jd.blockchain.crypto.PubKey; import com.jd.blockchain.ledger.*; -import com.jd.blockchain.utils.net.NetworkAddress; public class SDK_RegistParticipant_Demo extends SDK_Base_Demo { @@ -27,14 +26,11 @@ public class SDK_RegistParticipant_Demo extends SDK_Base_Demo { BlockchainKeypair user = new BlockchainKeypair(pubKey, privKey); - // 新参与方的共识网络地址 - NetworkAddress networkAddress = new NetworkAddress("127.0.0.1", 20000); - // 定义交易模板 TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash); // 注册参与方 - txTpl.participants().register("Peer4", user.getIdentity(), networkAddress); + txTpl.participants().register("Peer4", user.getIdentity()); // TX 准备就绪； PreparedTransaction prepTx = txTpl.prepare(); From 656b931f24bd424f0e56247d124fda0940d2585a Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Mon, 20 Jul 2020 15:34:45 +0800 Subject: [PATCH 2/2] refactor auto add node system config update, modify sdk sample --- .../java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java index 1624cc92..771f661e 100644 --- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java +++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java @@ -39,8 +39,8 @@ public class SDKDemo_ActiveParticipant { BasicNameValuePair base58LedgerHash = new BasicNameValuePair("ledgerHash", "j5n3SmYT3rS5aDgwQbDUxBYUMEP9GvVfMiQK3Tcr3vxz3M"); // 激活的新参与方的共识网络地址 - BasicNameValuePair host = new BasicNameValuePair("host", "127.0.0.1"); - BasicNameValuePair port = new BasicNameValuePair("port", "20000"); + BasicNameValuePair host = new BasicNameValuePair("consensusHost", "127.0.0.1"); + BasicNameValuePair port = new BasicNameValuePair("consensusPort", "20000"); para.add(base58LedgerHash); para.add(host);