Browse Source

modify participant state update interface bug

tags/1.1.0
zhangshuang 5 years ago
parent
commit
13d2218f29
12 changed files with 16 additions and 0 deletions
  1. +1
    -0
      source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployExeUtil.java
  2. +1
    -0
      source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java
  3. +1
    -0
      source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerManagerTest.java
  4. +1
    -0
      source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TransactionSetTest.java
  5. +1
    -0
      source/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/converters/BinaryMessageConverter.java
  6. +1
    -0
      source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java
  7. +1
    -0
      source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java
  8. +2
    -0
      source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java
  9. +3
    -0
      source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_State_Update_Test_.java
  10. +1
    -0
      source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java
  11. +1
    -0
      source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/SettingsInit.java
  12. +2
    -0
      source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java

+ 1
- 0
source/contract/contract-maven-plugin/src/main/java/com/jd/blockchain/ContractDeployExeUtil.java View File

@@ -95,6 +95,7 @@ public enum ContractDeployExeUtil {
DataContractRegistry.register(DataAccountRegisterOperation.class); DataContractRegistry.register(DataAccountRegisterOperation.class);
DataContractRegistry.register(UserRegisterOperation.class); DataContractRegistry.register(UserRegisterOperation.class);
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
} }


public BlockchainService initBcsrv(String host, int port) { public BlockchainService initBcsrv(String host, int port) {


+ 1
- 0
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java View File

@@ -33,6 +33,7 @@ public class ContractInvokingTest {
DataContractRegistry.register(TransactionResponse.class); DataContractRegistry.register(TransactionResponse.class);
DataContractRegistry.register(UserRegisterOperation.class); DataContractRegistry.register(UserRegisterOperation.class);
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
} }


private static final String LEDGER_KEY_PREFIX = "LDG://"; private static final String LEDGER_KEY_PREFIX = "LDG://";


+ 1
- 0
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerManagerTest.java View File

@@ -45,6 +45,7 @@ public class LedgerManagerTest {
DataContractRegistry.register(UserRegisterOperation.class); DataContractRegistry.register(UserRegisterOperation.class);
DataContractRegistry.register(DataAccountRegisterOperation.class); DataContractRegistry.register(DataAccountRegisterOperation.class);
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
DataContractRegistry.register(BlockBody.class); DataContractRegistry.register(BlockBody.class);
DataContractRegistry.register(CryptoProvider.class); DataContractRegistry.register(CryptoProvider.class);
} }


+ 1
- 0
source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/TransactionSetTest.java View File

@@ -37,6 +37,7 @@ public class TransactionSetTest {
DataContractRegistry.register(ContractCodeDeployOperation.class); DataContractRegistry.register(ContractCodeDeployOperation.class);
DataContractRegistry.register(ContractEventSendOperation.class); DataContractRegistry.register(ContractEventSendOperation.class);
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
CryptoSetting defCryptoSetting = LedgerTestUtils.createDefaultCryptoSetting(); CryptoSetting defCryptoSetting = LedgerTestUtils.createDefaultCryptoSetting();


MemoryKVStorage testStorage = new MemoryKVStorage(); MemoryKVStorage testStorage = new MemoryKVStorage();


+ 1
- 0
source/ledger/ledger-rpc/src/main/java/com/jd/blockchain/web/converters/BinaryMessageConverter.java View File

@@ -47,6 +47,7 @@ public class BinaryMessageConverter extends AbstractHttpMessageConverter<Object>
DataContractRegistry.register(DataAccountRegisterOperation.class); DataContractRegistry.register(DataAccountRegisterOperation.class);
DataContractRegistry.register(UserRegisterOperation.class); DataContractRegistry.register(UserRegisterOperation.class);
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);


DataContractRegistry.register(ActionRequest.class); DataContractRegistry.register(ActionRequest.class);
DataContractRegistry.register(ActionResponse.class); DataContractRegistry.register(ActionResponse.class);


+ 1
- 0
source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java View File

@@ -103,6 +103,7 @@ public class ManagementController implements LedgerBindingConfigAware, PeerManag
DataContractRegistry.register(DataAccountRegisterOperation.class); DataContractRegistry.register(DataAccountRegisterOperation.class);
DataContractRegistry.register(UserRegisterOperation.class); DataContractRegistry.register(UserRegisterOperation.class);
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
DataContractRegistry.register(ActionResponse.class); DataContractRegistry.register(ActionResponse.class);


+ 1
- 0
source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java View File

@@ -48,6 +48,7 @@ public class GatewayServiceFactory implements BlockchainServiceFactory, Closeabl
DataContractRegistry.register(DataAccountRegisterOperation.class); DataContractRegistry.register(DataAccountRegisterOperation.class);
DataContractRegistry.register(UserRegisterOperation.class); DataContractRegistry.register(UserRegisterOperation.class);
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
DataContractRegistry.register(ActionRequest.class); DataContractRegistry.register(ActionRequest.class);
DataContractRegistry.register(ActionResponse.class); DataContractRegistry.register(ActionResponse.class);


+ 2
- 0
source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_Regist_Test_.java View File

@@ -59,6 +59,8 @@ public class SDK_GateWay_Participant_Regist_Test_ {
DataContractRegistry.register(NodeRequest.class); DataContractRegistry.register(NodeRequest.class);
DataContractRegistry.register(EndpointRequest.class); DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class); DataContractRegistry.register(TransactionResponse.class);
DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
} }


@Test @Test


+ 3
- 0
source/sdk/sdk-samples/src/test/java/test/com/jd/blockchain/sdk/test/SDK_GateWay_Participant_State_Update_Test_.java View File

@@ -56,6 +56,9 @@ public class SDK_GateWay_Participant_State_Update_Test_ {
DataContractRegistry.register(NodeRequest.class); DataContractRegistry.register(NodeRequest.class);
DataContractRegistry.register(EndpointRequest.class); DataContractRegistry.register(EndpointRequest.class);
DataContractRegistry.register(TransactionResponse.class); DataContractRegistry.register(TransactionResponse.class);
DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
} }


@Test @Test


+ 1
- 0
source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java View File

@@ -77,6 +77,7 @@ public class LedgerPerformanceTest {
DataContractRegistry.register(DataAccountRegisterOperation.class); DataContractRegistry.register(DataAccountRegisterOperation.class);
DataContractRegistry.register(DataAccountKVSetOperation.class); DataContractRegistry.register(DataAccountKVSetOperation.class);
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);
} }


public static void test(String[] args) { public static void test(String[] args) {


+ 1
- 0
source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/SettingsInit.java View File

@@ -47,6 +47,7 @@ public class SettingsInit {
DataContractRegistry.register(DataAccountRegisterOperation.class); DataContractRegistry.register(DataAccountRegisterOperation.class);
DataContractRegistry.register(UserRegisterOperation.class); DataContractRegistry.register(UserRegisterOperation.class);
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);


DataContractRegistry.register(ActionResponse.class); DataContractRegistry.register(ActionResponse.class);




+ 2
- 0
source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java View File

@@ -8,6 +8,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;


import com.jd.blockchain.binaryproto.DataContract;
import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.binaryproto.DataContractRegistry;
import com.jd.blockchain.consensus.ClientIdentification; import com.jd.blockchain.consensus.ClientIdentification;
import com.jd.blockchain.consensus.ClientIdentifications; import com.jd.blockchain.consensus.ClientIdentifications;
@@ -89,6 +90,7 @@ public class MockerNodeContext implements BlockchainQueryService {
DataContractRegistry.register(ParticipantRegisterOperation.class); DataContractRegistry.register(ParticipantRegisterOperation.class);
DataContractRegistry.register(DataAccountKVSetOperation.class); DataContractRegistry.register(DataAccountKVSetOperation.class);
DataContractRegistry.register(DataAccountKVSetOperation.KVWriteEntry.class); DataContractRegistry.register(DataAccountKVSetOperation.KVWriteEntry.class);
DataContractRegistry.register(ParticipantStateUpdateOperation.class);


DataContractRegistry.register(ActionRequest.class); DataContractRegistry.register(ActionRequest.class);
DataContractRegistry.register(ActionResponse.class); DataContractRegistry.register(ActionResponse.class);


Loading…
Cancel
Save