diff --git a/msp/Org1MSP/admin.context b/msp/Org1MSP/admin.context index 3de9c8c..0e3ec72 100644 Binary files a/msp/Org1MSP/admin.context and b/msp/Org1MSP/admin.context differ diff --git a/msp/toto/abdel.context b/msp/toto/abdel.context deleted file mode 100644 index 95e9850..0000000 Binary files a/msp/toto/abdel.context and /dev/null differ diff --git a/src/main/java/blockchain/configuration/Config.java b/src/main/java/blockchain/configuration/Config.java index 190bb05..c7dce62 100644 --- a/src/main/java/blockchain/configuration/Config.java +++ b/src/main/java/blockchain/configuration/Config.java @@ -4,7 +4,7 @@ public class Config { public static final String ORG1_MSP = "Org1MSP"; - public static final String ORG1 = "org1"; + public static final String ORG1 = "Org1"; public static final String ADMIN = "admin"; @@ -16,7 +16,7 @@ public class Config { public static final String ORDERER_NAME = "orderer.example.com"; - public static final String CHANNEL_NAME = "mychannel"; + public static final String CHANNEL_NAME = "mychannel_mycc"; public static final String CHAINCODE_NAME = "mycc"; @@ -26,5 +26,11 @@ public class Config { public static final String USER_TEST_SECRET = "frwcKfCYPxWA"; + //TEST + public static final String ORG_PEER_URL = "grpc://vps592802.ovh.net:9051"; + + public static final String ORG_PEER_EVENT_URL = "grpc://vps592802.ovh.net:9053"; + + } diff --git a/src/test/java/blockchain/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java index 0507e26..7f5ff95 100644 --- a/src/test/java/blockchain/query/QueryTest.java +++ b/src/test/java/blockchain/query/QueryTest.java @@ -21,13 +21,15 @@ public class QueryTest { BasicConfigurator.configure(); UserContext admin = Util.readUserContext(Config.ORG1,Config.ADMIN); try{ - String chaincode = "mycc"; + String chaincode = Config.CHAINCODE_NAME; FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(admin); ChannelClientWrapper channelClientWrapper = fabricClientWrapper.createChannelClient(Config.CHANNEL_NAME); Channel channel = channelClientWrapper.getChannel(); Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL); + //Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG_PEER_URL); EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps577432.ovh.net:8053"); + //EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", Config.ORG_PEER_EVENT_URL); Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL); channel.addPeer(peer); channel.addEventHub(eventHub); diff --git a/target/classes/blockchain/configuration/Config.class b/target/classes/blockchain/configuration/Config.class index 8b1c44a..e556f14 100644 Binary files a/target/classes/blockchain/configuration/Config.class and b/target/classes/blockchain/configuration/Config.class differ diff --git a/target/test-classes/blockchain/client/TestEnrollAdmin.class b/target/test-classes/blockchain/client/TestEnrollAdmin.class index 98cb24a..5d5312d 100644 Binary files a/target/test-classes/blockchain/client/TestEnrollAdmin.class and b/target/test-classes/blockchain/client/TestEnrollAdmin.class differ diff --git a/target/test-classes/blockchain/client/TestRegisterEnrollUser.class b/target/test-classes/blockchain/client/TestRegisterEnrollUser.class index f8d05b2..623e078 100644 Binary files a/target/test-classes/blockchain/client/TestRegisterEnrollUser.class and b/target/test-classes/blockchain/client/TestRegisterEnrollUser.class differ diff --git a/target/test-classes/blockchain/query/QueryTest.class b/target/test-classes/blockchain/query/QueryTest.class index ef729d8..18780f1 100644 Binary files a/target/test-classes/blockchain/query/QueryTest.class and b/target/test-classes/blockchain/query/QueryTest.class differ