From 981892caf9091708c17bda2d7879352177f8bcfa Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Wed, 18 Sep 2019 10:09:06 +0800 Subject: [PATCH] distinguish operations for the browser --- .../handles/ParticipantRegisterOperationHandle.java | 4 ++-- .../handles/ParticipantStateUpdateOperationHandle.java | 2 +- .../ledger/ParticipantRegisterOperation.java | 2 +- .../ledger/ParticipantStateUpdateOperation.java | 2 +- .../transaction/ParticipantRegisterOpTemplate.java | 10 +++++----- .../transaction/ParticipantStateUpdateOpTemplate.java | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantRegisterOperationHandle.java b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantRegisterOperationHandle.java index e3e8f6e1..e02c2220 100644 --- a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantRegisterOperationHandle.java +++ b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantRegisterOperationHandle.java @@ -39,7 +39,7 @@ public class ParticipantRegisterOperationHandle extends AbstractLedgerOperationH LedgerAdminDataset adminAccountDataSet = newBlockDataset.getAdminDataset(); - ParticipantInfo participantInfo = new ParticipantInfoData(participantRegOp.getParticipantName(), participantRegOp.getParticipantIdentity().getPubKey(), participantRegOp.getNetworkAddress()); + ParticipantInfo participantInfo = new ParticipantInfoData(participantRegOp.getParticipantName(), participantRegOp.getParticipantRegisterIdentity().getPubKey(), participantRegOp.getNetworkAddress()); ParticipantNode participantNode = new PartNode((int)(adminAccountDataSet.getParticipantCount()), participantInfo.getName(), participantInfo.getPubKey(), ParticipantNodeState.REGISTERED); @@ -47,7 +47,7 @@ public class ParticipantRegisterOperationHandle extends AbstractLedgerOperationH adminAccountDataSet.addParticipant(participantNode); // Build UserRegisterOperation, reg participant as user - UserRegisterOperation userRegOp = new UserRegisterOpTemplate(participantRegOp.getParticipantIdentity()); + UserRegisterOperation userRegOp = new UserRegisterOpTemplate(participantRegOp.getParticipantRegisterIdentity()); handleContext.handle(userRegOp); } diff --git a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantStateUpdateOperationHandle.java b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantStateUpdateOperationHandle.java index 799ac36c..094a2e1a 100644 --- a/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantStateUpdateOperationHandle.java +++ b/source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ParticipantStateUpdateOperationHandle.java @@ -48,7 +48,7 @@ public class ParticipantStateUpdateOperationHandle extends AbstractLedgerOperati ParticipantNode participantNode = null; for(int i = 0; i < participants.length; i++) { - if (stateUpdateOperation.getParticipantIdentity().getPubKey().equals(participants[i].getPubKey())) { + if (stateUpdateOperation.getStateUpdateIdentity().getPubKey().equals(participants[i].getPubKey())) { participantNode = new PartNode(participants[i].getId(), participants[i].getName(), participants[i].getPubKey(), ParticipantNodeState.ACTIVED); break; } diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ParticipantRegisterOperation.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ParticipantRegisterOperation.java index a8ccf227..ec946593 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ParticipantRegisterOperation.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ParticipantRegisterOperation.java @@ -13,7 +13,7 @@ public interface ParticipantRegisterOperation extends Operation { String getParticipantName(); @DataField(order = 1, refContract = true) - BlockchainIdentity getParticipantIdentity(); + BlockchainIdentity getParticipantRegisterIdentity(); @DataField(order = 2, primitiveType = PrimitiveType.BYTES) NetworkAddress getNetworkAddress(); diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ParticipantStateUpdateOperation.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ParticipantStateUpdateOperation.java index 46cfea0e..fa2791a7 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ParticipantStateUpdateOperation.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ParticipantStateUpdateOperation.java @@ -10,7 +10,7 @@ import com.jd.blockchain.utils.net.NetworkAddress; public interface ParticipantStateUpdateOperation extends Operation { @DataField(order = 0, refContract = true) - BlockchainIdentity getParticipantIdentity(); + BlockchainIdentity getStateUpdateIdentity(); @DataField(order = 1, primitiveType = PrimitiveType.BYTES) NetworkAddress getNetworkAddress(); diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ParticipantRegisterOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ParticipantRegisterOpTemplate.java index 2b5c608d..925b8338 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ParticipantRegisterOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ParticipantRegisterOpTemplate.java @@ -14,12 +14,12 @@ public class ParticipantRegisterOpTemplate implements ParticipantRegisterOperati } private String participantName; - private BlockchainIdentity participantPubKey; + private BlockchainIdentity participantRegisterIdentity; private NetworkAddress networkAddress; - public ParticipantRegisterOpTemplate(String participantName, BlockchainIdentity participantPubKey, NetworkAddress networkAddress) { + public ParticipantRegisterOpTemplate(String participantName, BlockchainIdentity participantRegisterIdentity, NetworkAddress networkAddress) { this.participantName = participantName; - this.participantPubKey = participantPubKey; + this.participantRegisterIdentity = participantRegisterIdentity; this.networkAddress = networkAddress; } @@ -30,8 +30,8 @@ public class ParticipantRegisterOpTemplate implements ParticipantRegisterOperati } @Override - public BlockchainIdentity getParticipantIdentity() { - return participantPubKey; + public BlockchainIdentity getParticipantRegisterIdentity() { + return participantRegisterIdentity; } @Override diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ParticipantStateUpdateOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ParticipantStateUpdateOpTemplate.java index abb3b28d..ff91eba5 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ParticipantStateUpdateOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ParticipantStateUpdateOpTemplate.java @@ -12,21 +12,21 @@ public class ParticipantStateUpdateOpTemplate implements ParticipantStateUpdateO DataContractRegistry.register(ParticipantStateUpdateOperation.class); } - private BlockchainIdentity blockchainIdentity; + private BlockchainIdentity stateUpdateIdentity; private NetworkAddress networkAddress; private ParticipantNodeState participantNodeState; - public ParticipantStateUpdateOpTemplate(BlockchainIdentity blockchainIdentity, NetworkAddress networkAddress, ParticipantNodeState participantNodeState) { + public ParticipantStateUpdateOpTemplate(BlockchainIdentity stateUpdateIdentity, NetworkAddress networkAddress, ParticipantNodeState participantNodeState) { - this.blockchainIdentity = blockchainIdentity; + this.stateUpdateIdentity = stateUpdateIdentity; this.networkAddress = networkAddress; this.participantNodeState = participantNodeState; } @Override - public BlockchainIdentity getParticipantIdentity() { - return blockchainIdentity; + public BlockchainIdentity getStateUpdateIdentity() { + return stateUpdateIdentity; } @Override