Merge branch 'features/queryChannel' into develop

2018-11-06 10:41:05 +01:00 · 2018-11-06 10:41:05 +01:00 · 670acb078e
parent 8222a0220a 52ba2f3f5d
commit 670acb078e
7 changed files with 3 additions and 0 deletions
--- a/msp/org1/User-org1.context
+++ b/msp/org1/User-org1.context
--- a/msp/org1/admin.context
+++ b/msp/org1/admin.context
--- a/src/main/java/blockchain/configuration/Config.java
+++ b/src/main/java/blockchain/configuration/Config.java
@ -12,6 +12,9 @@ public class Config {

    public static final String ADMIN_PASSWORD = "adminpw";

+    //USER
+    public static final String UserPWD = "ZIidLJHQbLcC";
+
    //CA
    public static final String CA_ORG1_URL = "http://vps577432.ovh.net:7054";

--- a/target/classes/blockchain/client/FabricClientWrapper.class
+++ b/target/classes/blockchain/client/FabricClientWrapper.class
--- a/target/classes/blockchain/configuration/Config.class
+++ b/target/classes/blockchain/configuration/Config.class
--- a/target/test-classes/blockchain/client/TestEnrollAdmin.class
+++ b/target/test-classes/blockchain/client/TestEnrollAdmin.class
--- a/target/test-classes/blockchain/query/QueryChannelTest.class
+++ b/target/test-classes/blockchain/query/QueryChannelTest.class