diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7e3b578..d7031dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,14 @@
+
+
+
+
-
+
+
@@ -19,38 +24,112 @@
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -158,6 +239,14 @@
+
+
+
+
+
+
+
+
@@ -184,6 +273,15 @@
+
+
+
+
+
+
+
+
+
@@ -210,6 +308,15 @@
+
+
+
+
+
+
+
+
+
@@ -265,6 +372,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -283,7 +417,7 @@
-
+
@@ -309,7 +443,7 @@
-
+
@@ -422,11 +556,11 @@
-
-
-
+
+
+
@@ -456,49 +590,59 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -509,7 +653,7 @@
-
+
@@ -518,7 +662,7 @@
-
+
@@ -597,20 +741,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -633,48 +763,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -728,23 +816,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -776,9 +847,6 @@
-
-
-
@@ -796,6 +864,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/msp/org1/User-org1.context b/msp/org1/User-org1.context
deleted file mode 100644
index 0dbf1f5..0000000
Binary files a/msp/org1/User-org1.context and /dev/null differ
diff --git a/msp/org1/User2-org1.context b/msp/org1/User2-org1.context
deleted file mode 100644
index 651edfc..0000000
Binary files a/msp/org1/User2-org1.context and /dev/null differ
diff --git a/msp/org1/admin.context b/msp/org1/admin.context
index 7511448..9cd1a0c 100644
Binary files a/msp/org1/admin.context and b/msp/org1/admin.context differ
diff --git a/src/main/java/blockchain/client/ChannelClientWrapper.java b/src/main/java/blockchain/client/ChannelClientWrapper.java
index 4e84469..6f67847 100644
--- a/src/main/java/blockchain/client/ChannelClientWrapper.java
+++ b/src/main/java/blockchain/client/ChannelClientWrapper.java
@@ -56,7 +56,8 @@ public class ChannelClientWrapper {
channel = channelClientWrapper.getChannel();
Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL);
- EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps577432.ovh.net:8053");
+ //EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps577432.ovh.net:8053");
+ EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://93.30.148.59:7053");
Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL);
channel.addPeer(peer);
channel.addEventHub(eventHub);
diff --git a/src/main/java/blockchain/configuration/Config.java b/src/main/java/blockchain/configuration/Config.java
index a56f753..161b839 100644
--- a/src/main/java/blockchain/configuration/Config.java
+++ b/src/main/java/blockchain/configuration/Config.java
@@ -7,7 +7,7 @@ public class Config {
//ORGANIZATION
public static final String ORG1_MSP = "Org1MSP";
- public static final String ORG1 = "org1";
+ public static final String ORG1 = "Org1";
//ADMIN
public static final String ADMIN = "admin";
@@ -15,25 +15,33 @@ public class Config {
public static final String ADMIN_PASSWORD = "adminpw";
//USER
- public static final String UserPWD = "ZIidLJHQbLcC";
+ //public static final String UserPWD = "ZIidLJHQbLcC";
+ public static final String UserPWD = "OelXVCdHnYPe";
+
+
//CA
- public static final String CA_ORG1_URL = "http://vps577432.ovh.net:7054";
+ //public static final String CA_ORG1_URL = "http://vps577432.ovh.net:7054";
+ public static final String CA_ORG1_URL = "http://93.30.148.59:7054";
//ORDERER
- public static final String ORDERER_URL = "grpc://vps577432.ovh.net:7050";
+ //public static final String ORDERER_URL = "grpc://vps577432.ovh.net:7050";
+ public static final String ORDERER_URL = "grpc://93.30.148.59:7050";
public static final String ORDERER_NAME = "orderer.example.com";
//CHANNEL - CHAINCODE
public static final String CHANNEL_NAME = "mychannel";
- public static final String CHAINCODE_NAME = "mycc";
+ //public static final String CHAINCODE_NAME = "mycc";
+ public static final String CHAINCODE_NAME = "monnethic";
//PEER 0
public static final String ORG1_PEER_0 = "peer0.org1.example.com";
- public static final String ORG1_PEER_0_URL = "grpc://vps577432.ovh.net:8051";
+ //public static final String ORG1_PEER_0_URL = "grpc://vps577432.ovh.net:8051";
+ public static final String ORG1_PEER_0_URL = "grpc://93.30.148.59:7051";
+ //public static final String ORG1_PEER_0_URL = "grpc://93.30.148.59:8051";
//PEER 1
public static final String ORG_PEER = "peer1.org1.example.com";
diff --git a/src/test/java/blockchain/client/TestRegisterEnrollUser.java b/src/test/java/blockchain/client/TestRegisterEnrollUser.java
index 3957856..d1ffb21 100644
--- a/src/test/java/blockchain/client/TestRegisterEnrollUser.java
+++ b/src/test/java/blockchain/client/TestRegisterEnrollUser.java
@@ -21,7 +21,7 @@ public class TestRegisterEnrollUser {
caClientWrapper.setAdminContext(admin);
UserContext userContext = new UserContext();
- userContext.setName("User2-org1");
+ userContext.setName("User-org1");
userContext.setAffiliation(Config.ORG1);
userContext.setMspId(Config.ORG1_MSP);
String userSecret = caClientWrapper.registerUser(userContext.getName(),userContext.getAffiliation());
diff --git a/src/test/java/blockchain/query/QueryChannelTest.java b/src/test/java/blockchain/query/QueryChannelTest.java
index b118aa4..5b9fe34 100644
--- a/src/test/java/blockchain/query/QueryChannelTest.java
+++ b/src/test/java/blockchain/query/QueryChannelTest.java
@@ -20,7 +20,7 @@ public class QueryChannelTest {
@Test
public void testQ(){
BasicConfigurator.configure();
- UserContext userContext = Util.readUserContext(Config.ORG1,"User-org1");
+ UserContext userContext = Util.readUserContext(Config.ORG1,"admin");
try{
FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(userContext);
diff --git a/src/test/java/blockchain/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java
index 39613f3..9ef3b63 100644
--- a/src/test/java/blockchain/query/QueryTest.java
+++ b/src/test/java/blockchain/query/QueryTest.java
@@ -23,7 +23,7 @@ public class QueryTest {
BasicConfigurator.configure();
//UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN);
- UserContext user = Util.readUserContext(Config.ORG1,"User-org1");
+ UserContext user = Util.readUserContext(Config.ORG1,"admin");
try{
String chaincode = Config.CHAINCODE_NAME;