From 05b18274506c5ffe0d237097e9fc622f59ca7b3d Mon Sep 17 00:00:00 2001
From: GME <guillaume.meneroud@gmail.com>
Date: Thu, 14 Mar 2019 20:44:40 +0100
Subject: [PATCH] latest test

---
 .idea/workspace.xml                           |  97 +++++++++---------
 msp/org1/admin.context                        | Bin 1729 -> 1729 bytes
 .../java/blockchain/configuration/Config.java |   3 +-
 src/test/java/blockchain/query/QueryTest.java |   4 +-
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d7031dc..e548aef 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,13 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7c8802f8-163e-48a6-9d7a-9324ac89091d" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/msp/org1/User-org1.context" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/msp/org1/User2-org1.context" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/msp/org1/admin.context" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -24,11 +19,11 @@
     <session id="-1607393105">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="13" />
+          <entry key="project.closed" value="15" />
           <entry key="project.open.time.5" value="3" />
-          <entry key="project.open.time.6" value="9" />
+          <entry key="project.open.time.6" value="11" />
           <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="13" />
+          <entry key="project.opened" value="15" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
@@ -45,23 +40,23 @@
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="168" />
+          <entry key="java" value="193" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="168" />
+          <entry key="JAVA" value="193" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="201">
-              <caret line="36" column="31" selection-start-line="36" selection-start-column="31" selection-end-line="36" selection-end-column="31" />
+            <state relative-caret-position="575">
+              <caret line="37" column="64" selection-start-line="37" selection-start-column="64" selection-end-line="37" selection-end-column="64" />
             </state>
           </provider>
         </entry>
@@ -111,11 +106,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="28" column="42" lean-forward="true" selection-start-line="28" selection-start-column="42" selection-end-line="28" selection-end-column="42" />
+            <state relative-caret-position="425">
+              <caret line="35" column="37" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" />
             </state>
           </provider>
         </entry>
@@ -179,8 +174,8 @@
         <option value="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" />
-        <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" />
+        <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
       </list>
     </option>
   </component>
@@ -201,8 +196,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -417,7 +412,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551295777732" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552592496675" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -557,8 +552,8 @@
     <recent_temporary>
       <list>
         <item itemvalue="JUnit.QueryTest" />
-        <item itemvalue="JUnit.QueryChannelTest" />
         <item itemvalue="JUnit.TestEnrollAdmin" />
+        <item itemvalue="JUnit.QueryChannelTest" />
         <item itemvalue="JUnit.TestRegisterEnrollUser" />
         <item itemvalue="JUnit.ReadUserTest" />
       </list>
@@ -601,19 +596,12 @@
       <workItem from="1551124909913" duration="739000" />
       <workItem from="1551206164180" duration="2072000" />
       <workItem from="1551295665994" duration="704000" />
+      <workItem from="1552248848133" duration="108000" />
+      <workItem from="1552592166048" duration="379000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="QueryChannelTest - 2019.02.26 at 19h 52m 21s.xml">
-      <configuration name="QueryChannelTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="QueryTest - 2019.02.26 at 19h 52m 32s.xml">
-      <configuration name="QueryTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="QueryChannelTest - 2019.02.26 at 19h 52m 57s.xml">
-      <configuration name="QueryChannelTest" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="QueryTest - 2019.02.26 at 19h 53m 12s.xml">
       <configuration name="QueryTest" configurationId="JUnit" />
     </history-entry>
@@ -635,14 +623,23 @@
     <history-entry file="QueryTest - 2019.02.27 at 20h 28m 57s.xml">
       <configuration name="QueryTest" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="TestEnrollAdmin - 2019.03.14 at 20h 40m 04s.xml">
+      <configuration name="TestEnrollAdmin" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryTest - 2019.03.14 at 20h 40m 44s.xml">
+      <configuration name="QueryTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryTest - 2019.03.14 at 20h 41m 41s.xml">
+      <configuration name="QueryTest" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="42986000" />
+    <option name="totallyTimeSpent" value="43473000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27623212" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2810016" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -653,7 +650,7 @@
       <window_info id="Capture Tool" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.8398251" weight="0.45787832" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.83942765" weight="0.5210608" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.71510416" weight="0.3995749" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -662,7 +659,7 @@
       <window_info anchor="bottom" id="Messages" order="8" />
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="10" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.16017488" side_tool="true" visible="true" weight="0.45787832" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.16057234" side_tool="true" visible="true" weight="0.5210608" />
       <window_info anchor="bottom" id="Spring" order="12" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -688,7 +685,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java</url>
-          <line>35</line>
+          <line>37</line>
           <properties />
           <option name="timeStamp" value="1" />
         </line-breakpoint>
@@ -892,6 +889,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="575">
+          <caret line="37" column="64" selection-start-line="37" selection-start-column="64" selection-end-line="37" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="26" column="63" selection-start-line="26" selection-start-column="63" selection-end-line="26" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
@@ -927,24 +938,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="26" column="63" selection-start-line="26" selection-start-column="63" selection-end-line="26" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="28" column="42" lean-forward="true" selection-start-line="28" selection-start-column="42" selection-end-line="28" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="36" column="31" selection-start-line="36" selection-start-column="31" selection-end-line="36" selection-end-column="31" />
+        <state relative-caret-position="425">
+          <caret line="35" column="37" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" />
         </state>
       </provider>
     </entry>
diff --git a/msp/org1/admin.context b/msp/org1/admin.context
index 9cd1a0c9553e9a9c4d9de8e39b69a05367a6f651..837292f63ad270e7d6b7f83ee9cbe89e70957b13 100644
GIT binary patch
delta 609
zcmbu%&1=(8008jTZcYmWVQjd=5WLx<>zDn&?(q8Byrk)Cnzm_^fI^zow8@&JN!qjp
znI}a&h!lpR2glq&K@dc7#~!>2?xZMsP`u5Hq97jhfAIP{{AP=@#ix=#q(KOzt_nOV
z2ULn{XM~u|MtRoF^GZ>l6uTx}9ZQ>HMVQ|7@2^b?5nR_N<vQ@19l4A(;NeMO^3Nhc
zJe7{{O*u+xsg~%r&I@T;W35<{tYr*F&!qH-QPOgRf`s0vLIhKTc-j(Vg&Z|3SvT~{
z61Ky`8c+t3rYKatlGD?rs>t@Zx(KD|i9mLX7L{?e$n`jcL>jEO%Dn1oPz&m5xs9QN
zK$KG`kJT}x0acEa2$1q5j`n(kXxhmbGOg3%P-Zln=M1S4vs{gmi3w^3F)$H?eN@AV
zOb%cOA}YWI4pJ;^AORtl7Zo*8Cb&AKueWV^1Z|^V7{yS-i5oacSV7cr!flUIVb~^;
zZAt2ONUhI=c|v12)HJLV-82MpTsO;Pwcwdd+B2W6&Jq5t+k20g0Dq}Fy|5kKxFIaX
zFFwhh-29aI@cr@g74z-s2f?GqLf6RG8v*~qPCk(H%{lDn!xuesI~z)zdB1b;(|P!7
zKXL!%Z28TddrPmr9sb$7zIJN4Yg1pY?1q2;xH|m0J2(hrSF>kVDtGhmj*lGMmo;tm
fT+197(~tAF>i<2uz6HisqqtUaee;si>l)TyYzyO^

delta 609
zcmbu%J&)300KjpOdofLj#?3SCN~2K9A(tGQr%$1@<tZ)j0M|i%C|qed%1es{7K|Da
z&%uGs7+(f&(HL?L#v4p7Msw38ZVtx5FW_Y2WOVQwxc&1R{)gei@PY&*We5SWOyG+g
zFhwjGjP6E36hTHMsd~BR)9qABtw7tHKM1}%Z;LD{x5sD#{A$ZkkPUqF&#1zjoTydv
zY>UL9<q!A-s}MKlTAm=ZB&W*D$&ns4<Qgrb5=&FU*qxa9Mq6{5or&2ORNRizVxBMK
zB=6+vf`--N7VZkV8JBDQ`RUN+RBcTXC0O?|W2cd{x4nGck#@Ke<pJ16&=mlK8=|lM
zZ5fDSO{^9L?8IfIr44~DIXch{S?e)a)OIXBLlm`$$RuObC<M9!gngle5*r*q5X20C
zG8z;?CzI<{c&kZ9O<(CJeHZh7NANILAz-M{kne72jLcHWMs^)o98O`4O$_Xj9jk~r
zENzj3A^8cQbq4FS?zp(eM=KJ;+m@Mrb9N~koE}m4zeiB>{r<tdQtH&~g<?Iq`E#+i
zmNp;V_)!nMenzdFjLdS!=}>U>IUnKzOVN@3<-+3C)hp{S6Z>>_?TlHAAAEfJ_2P7w
zx%B%S&E9_7;QYN~YL*tS{kro3DR&>=`UK!-BCTwPcdw7!L142xFfZ4;LudYN`C<9L
Vk6vK4FfbWZQoX=3X>=^7_Xkn^)lvWe

diff --git a/src/main/java/blockchain/configuration/Config.java b/src/main/java/blockchain/configuration/Config.java
index 161b839..7434e7b 100644
--- a/src/main/java/blockchain/configuration/Config.java
+++ b/src/main/java/blockchain/configuration/Config.java
@@ -34,7 +34,8 @@ public class Config {
     public static final String CHANNEL_NAME = "mychannel";
 
     //public static final String CHAINCODE_NAME = "mycc";
-    public static final String CHAINCODE_NAME = "monnethic";
+    //public static final String CHAINCODE_NAME = "monnethic";
+    public static final String CHAINCODE_NAME = "monnethic-dev-4";
 
     //PEER 0
     public static final String ORG1_PEER_0 = "peer0.org1.example.com";
diff --git a/src/test/java/blockchain/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java
index 9ef3b63..f1b6af0 100644
--- a/src/test/java/blockchain/query/QueryTest.java
+++ b/src/test/java/blockchain/query/QueryTest.java
@@ -31,7 +31,9 @@ public class QueryTest {
 
             ChannelClientWrapper channelClientWrapper = ChannelClientWrapper.setupChannel(fabricClientWrapper);
 
-            String[] args1 = {"a"};
+            //String[] args1 = {"a"};
+            //String[] args1 = {"chef"};
+            String[] args1 = {"bitman"};
 
             Collection<ProposalResponse> responseQuery = channelClientWrapper.queryByChainCode(chaincode,"query",args1);
             for(ProposalResponse pres : responseQuery){