Merge branch 'features/queryChaincode' into develop

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";
+
+
 
 }

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);