From 91ef184868d06ef8b24d899d572b5a8b709d539d Mon Sep 17 00:00:00 2001 From: GME Date: Sat, 17 Nov 2018 10:51:09 +0100 Subject: [PATCH] setup update --- msp/org1/admin.context | Bin 1729 -> 1729 bytes .../client/FabricClientWrapper.java | 3 +- .../query/CreateChaincodeUserTest.java | 48 ++++++++++++++++++ src/test/java/blockchain/query/QueryTest.java | 14 ++--- .../client/FabricClientWrapper.class | Bin 2976 -> 2976 bytes .../query/ChaincodeTransactionTest.class | Bin 6364 -> 6700 bytes .../query/CreateChaincodeUserTest.class | Bin 0 -> 3107 bytes .../blockchain/query/QueryTest.class | Bin 4634 -> 4638 bytes 8 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 src/test/java/blockchain/query/CreateChaincodeUserTest.java create mode 100644 target/test-classes/blockchain/query/CreateChaincodeUserTest.class diff --git a/msp/org1/admin.context b/msp/org1/admin.context index 60803d1c3d1bd0332d3da22713793a190986cb54..7511448c0adcfd5a29a77426e70200a0313bf384 100644 GIT binary patch delta 510 zcmX@edyscS0i(1_NLa3cmq&U|h=Hl0es*w{MUX|lv3s~rarxwK#$B?mM!q5GRsJE4 z<>490e!d~u6}};0F#|3?m&r*?;o*T^2H6H#rKTQL0cjN$A)fA`-e#%E!DgNT!EV_u zMJ0y*mLXmRuDM)p&WXiEZpkTTk>O6J1qP;tA%6KDW&T+e<%I^u`liNaA?3xM+6Bg$ zMi!NR-jfBGZDjo13yd@JOpS6Y%ga4-EOWh_LXt~^UAc-XG6N=OFo#9DI8{0sS4DV- zRau4w`}me-nHPkZM);OE2bTsGB!-t&rA8X3M@DiPm4{_JW;#VAI%S3xn-^xgSOk0f zM4&68Y!+wnV5}D@FQ~lKRj2kXH#$X`(X@5t z?&bf_N>|=K`uY{~bDe|w3%J-gwAwt**)lV-FLYscVqkHYt8&SDr@Zm~<3~jbN}SKbG!O;i(6TeBuy_GN41v$>WljWgsvFFww-<^I3&mo_@eugbggjZ7+v qix_P3i_-Oy@=Nn3-(&3$q1eO{26q3VbVJ|ZfD#7Q#FX63yaE9C;=(lm delta 510 zcmX@edyscS0i$$~nXg}QzL!C+V`{ordU#H%vw?rMwvSVJQvT#_#$B?GM!qiDmA+Yy z<>490e!d~u6}}-5F)qKV$w^G%;pQfe6>b5+#r~OvshMt`Vc`bGMv=}wPA-XAfvG`W zep$}prN*UU##}~)NkJY?zW!!jrY5C9Raqrj*+qH5o>9Je`KeV#7OsBINfkz^Wr6-t ziH>E7lLeStj^dl=GxhgFTd?#lxhediMmu46Tn)`>l zre|jaWCRtu_(ys~`Iv|Ll~`JO_~j*LdS#mg`g2)^I-5FXItIFzRwf(frg(r)=2j+p6q$GxB^M_edqjnJB!?7l7H9Ebtmk$u2#$Yp`Sp?9={alH{a@rN z>X{X_GRR`-)*1Ol>t81?;9}#@YV$Z}%go5W(1qEFf#rRJp~#mtR$B8qf<&Wzza=Og z3T`|rFoO@vG#{hY+?xmyMIx-p>J?N2?J|lN^WLe0RSu6zYhQa diff --git a/src/main/java/blockchain/client/FabricClientWrapper.java b/src/main/java/blockchain/client/FabricClientWrapper.java index 1c37e61..b06237c 100644 --- a/src/main/java/blockchain/client/FabricClientWrapper.java +++ b/src/main/java/blockchain/client/FabricClientWrapper.java @@ -36,7 +36,8 @@ public class FabricClientWrapper { public Set queryForChannels() throws InvalidArgumentException, IllegalArgumentException, ProposalException { client.newChannel(Config.CHANNEL_NAME); client.newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL); - Peer peer = client.newPeer(Config.ORG_PEER,Config.ORG_PEER_URL); + //Peer peer = client.newPeer(Config.ORG_PEER,Config.ORG_PEER_URL); + Peer peer = client.newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL); return client.queryChannels(peer); } } diff --git a/src/test/java/blockchain/query/CreateChaincodeUserTest.java b/src/test/java/blockchain/query/CreateChaincodeUserTest.java new file mode 100644 index 0000000..7f12805 --- /dev/null +++ b/src/test/java/blockchain/query/CreateChaincodeUserTest.java @@ -0,0 +1,48 @@ +package blockchain.query; + +import blockchain.client.ChannelClientWrapper; +import blockchain.client.FabricClientWrapper; +import blockchain.configuration.Config; +import blockchain.user.UserContext; +import blockchain.utility.Util; +import org.apache.log4j.BasicConfigurator; +import org.hyperledger.fabric.sdk.Channel; +import org.hyperledger.fabric.sdk.EventHub; +import org.hyperledger.fabric.sdk.Orderer; +import org.hyperledger.fabric.sdk.Peer; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + +public class CreateChaincodeUserTest { + @Test + public void TestCreateUser(){ + BasicConfigurator.configure(); + UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN); + + try{ + String chaincode = Config.CHAINCODE_NAME; + FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(user); + ChannelClientWrapper channelClientWrapper = fabricClientWrapper.createChannelClient(Config.CHANNEL_NAME); + + Channel channel = channelClientWrapper.getChannel(); + Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG_PEER,Config.ORG_PEER_URL); + 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); + channel.addOrderer(orderer); + channel.initialize(); + + List args = new ArrayList<>(); + args.add("user1"); + args.add("200"); + args.add("user2"); + args.add("150"); + + }catch (Exception e){ + e.printStackTrace(); + } + } +} diff --git a/src/test/java/blockchain/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java index da92875..b5af101 100644 --- a/src/test/java/blockchain/query/QueryTest.java +++ b/src/test/java/blockchain/query/QueryTest.java @@ -16,13 +16,13 @@ import java.util.Set; public class QueryTest { private static Logger logger = Logger.getLogger(QueryTest.class); - //DON'T WORK + @Test public void TestAQueryChannels() { BasicConfigurator.configure(); - UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN); - //UserContext user = Util.readUserContext(Config.ORG1,"User-org1"); + //UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN); + UserContext user = Util.readUserContext(Config.ORG1,"User-org1"); try{ @@ -44,10 +44,10 @@ public class QueryTest { 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.ORG_PEER,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); + Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL); + //Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG_PEER,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/client/FabricClientWrapper.class b/target/classes/blockchain/client/FabricClientWrapper.class index 03702050910918dceddd22299ead49d5e575d493..017d1ab455721ced9f277f59564ce0cde8367bdd 100644 GIT binary patch delta 44 zcmZ1=zCe6~Jqx43WCs>`esgmZV`eoG?@10%isvJAbv)DkPp&3P;j*;v&Xlo&K7hj9A<01^HR A!2kdN diff --git a/target/test-classes/blockchain/query/ChaincodeTransactionTest.class b/target/test-classes/blockchain/query/ChaincodeTransactionTest.class index 3d75b9c6f30d193ef45a664f64285adeb3e3a840..deb57c0aaa353ea3b6dbba888891604cdeb0574a 100644 GIT binary patch delta 1749 zcmZ`)X>^lC6umELGGD(;+mIGY3zSw$Xj-tA6etZ_*|fE_6j9tYw6R-Apb1q#jktk3 z__^SY8&yP>MgoE&;EuQ=E{Gc{ii$fbsFXJ;hxT}mKQi-X=DqvwdvoW@o}!h-k?lt| zZU#_H<8+M1H9D@vbpi`DEYfhjjvH{JhMNR#)}i4R4Y#U!v5qCUO<9J9+cn&w<4)YA zVX20@m3fbbdo|pr%=>jbfCtsEObrjI;bC>~h>l0`m>$7$wCOxNuHy-;(D0<1R|-6( zVU>o}8rGAWX1NYw-p`-r8_u zFfgfeOO^)$zLp7oZz$vo5lW0AOW(}#{$Oo$+#&Zr5ylqt;k;b}A979HM}dz7b_;wg zut(q%flmcK6Zo7qK*AV?xINitIclapj2E5X_rXbm>|Bni@tsK|*>BI%NBB$>LTBueI1 zjSmLHp>T_LR+TT@5UdNOSSiI$cAk3J5s~DeR6%KydQvYz>5_U=hNMjDLr8A&wt5Ta zgd6>Zm5rgWq`uV8PFWn;-;Vi`vMEQ>2{b@bE)5jqlsXNfJV7qPaD$TiWdDEr87!X) zjB2fS_F$ArjKNqzLnNI@1%e7CokUrZil`sKWdzA(ku;Rt(REsz#XL06rS8^{DZQf0 zl3gZqF%2_z*fY%@8XnzmFCjKY7`cwsIPGyv|krf?ijmwQ%m_oBP%t-*y*UEbR&g-)u}c15=kRzl*AR>LCnK^V@>KX8e{BB z-A!YSt!b5Y9)7l9-Rr6}wk&M3fOs6wt3sYh?dGost!2Z62|QZkn`xNHw(NAkBuwTN z;baarsbJF*2219x1Y>s31CbbpZh^ZrDI+O{;^}SBss_g}d@V=VSV2elZ6(C9ThNzr zdc%x9eA1s0vXPD)wg$k7Tz-oKnV=I@7=$yBhx6fr5BX?D1;RKL3s8wge7YE?@ynlr zcGU0_of^SzoQ{1s8wYVNC!E76L+C)5%xH}lvJ@$t>;O(dITw)5Z>ECb%$#@+Lsl_8 zCw4JtHJ9b)Ps0=jwlbAXn99h4Jyu~FQ_`5mLY#@|NMthea2Ds(5ou@Gb2zn)*%aVB z<}I0u6&JvZBqox88K~vN+^=K3wBZoyxHiJY+>u^<)`?Mn9HW6T8u_dY<_@kcNuWuf zS->waQy?G^6qqG2Tc9N(5E2Lr%n@8K=SzpF(;XymNdhiq9CfdA0lTiG!ZzO`Msi*y z0b4spmMROk) z9M@q^oC1*O@NB@SC`Kp>)J=;$`J%3hgIBP$`Wj4>GWh U9aKAG?6e*m@J!s=h8OVSQNY<`?f?J) delta 1543 zcmYk6dti@c6vsd3x9#`5dw-AZXBP{Fxo*O+(IodM+9H%vs@WEs*=GA$=(2RxP4cFD zBuPq%)reB*hA!4s3F)RQMMYQZyqoaPdCqyBbH3+$F7LY{Ye$djEr-`_0J5aJ%c)%D zay8Y4YaC`fTfJ8)aIY`!^TqwXc))*n(B&Z(y45V=VOPasmq%FQ@Th+-H9Y39%;9l|<^IJJe%zBG zR`67UvaJd6EYG>rvc}ie8lDf)m30XS8+`30-~VO9D=t0R7)v&s< zSw5z}w=|d;+-CWNPrY5i9;yA~i29muyd@@k#2&uYyq53y-tq%KT7F`$WuG7RGruSa%YJ?{{BAkOAyf4vS)YBh(cw}OaLw-S&jAw0OOEK(V%$Scn+j7%;osEiLvbXa2a z2!@$q#fW1h)`}}3Bi2e2iL(+fVIi(KuPQHNdZef%Bd4e`Vx_4hge6fUlftN(EX}N> z$O%@OOA8^fxQFjwl2X>FyABw9(81aClW zx2U$#uBJS8Sxndt*X~seDaos>EUXlIdi9}HZ+(1XO-_7zpiO(}AS9>dG_Y#OGIC;Z zVSc1<`goUY=~%O%X|_aVODC@`VWpRnlsi8u#VbfE3a42~moApewOlHRcsrANNjEPs zdAnqI`;v1Cvh`a)m&x^csurWVPFv*wwKDV+|F-iQWR)rb2C57;TqZI|b=&B`V1}qA zoUXwEKR8gOU`_Pykhiee-s*A7aB{oUlDSHqLOSOCy0Fm=aHX_Vw-lmip)ak7qqSOX zRJNrf?Z~9P`gI^zt#j$b1kxxZohb|_!U$$_7IVm9o_Z{2B&!)k9p|u}(d=QI=Bl82 zKjj=?nyyl11Mj(-CXU?6r=Um5MdT$7)z`YnW_ZO(`K&LW{%^0EvHTkx`6T3+Nc8xdLb8SI&I34hJ|$N zCvdU$-1oe&g^eAnf}4pn3f{_tCumoI|V0>Rd~&T6!Owwxa0M7)2X<+{8mn zr>X%)ck2kuv305Cloc9uY+b6+t{uNGGyQ1o-mIg`mfAo8ViU60(x-+jpMq%1|6jNy v9nTeN1-O!5^-NH0k^Wo{&|Er8S2>yHI-bTZu2kP=Sf${3z>EI@^=L26 diff --git a/target/test-classes/blockchain/query/CreateChaincodeUserTest.class b/target/test-classes/blockchain/query/CreateChaincodeUserTest.class new file mode 100644 index 0000000000000000000000000000000000000000..bcfa8fe9e39afbb6091120068c0d5ef63779663f GIT binary patch literal 3107 zcmbtWYj+b>6x|cj&U88yOrcnyl=5oJBa;?tA+1QM6qJ-ArL7>SlgW@yo6dyEq_n6g zDvEE#*IF*t(hs`)%$I<$mOsEBrS3aP+R#T}E%M>M=A3=*J!jvY`_I1*{|0afKdab{ zgoU2TA^O)Ov#v5u>}bQnR?8?QQ#`bD!3}cQ?Ua%8NQ6XgxY@FvHhbG)^v1^ zO9&6TDNDk-gzZ>o@-s=xJ8vX2T!|!H)5we)o-O93#jrnV=OpY+Br~o#ZB81tqhHNi z-n>5OS%z;7iWQTHV>tp@IloUrgXoK&#j1q5z)x6-C{xC)p=S&yt&jSi?WF0^c*RJ1 zwmF!wEythmjBHl8wO0l;gKzrKazpxWU;xLlGD`qDRsi6Jmst`)E+I(Rm2kbZJ~_`V zWUN%$^7P{7^jvCMFL~1;oVCOr+p1Zgr3p9agWk}?Wk{<)5AtKa0_@jOO{G#K9_fVd&U~Kb2d3Q;5e>t zh`j|z5p|f#le>C}Sn8;o_e^WZ7IfXZ3IU^nUmEtHUB)#Hb7+^)TESk^b*|XyycfjL zc}UKf2?pzuP-CQKY)8hthU<8T%QN$)$+A`YuS!G_^j)%@K1Gsgcn>#ZyszN{+|=+P zK4LBfZ@Qu)T-2H~X0jP8YPvHLTGC$DjO+SrHrI2c`*5r~>dsC^9m|g&iS=~J_*la& zd?G;&*fg0>#<<_AP6su7irc(hB{HoZuebNm!NqvJv7VTQ&+xg7FEo6KuQYs(Z!~<1 z?=;-OO(F(&IAGa;=Na>YYD}J>4tM&!h9B@F^`<)(E3I~O*44vV(KERH3q;iLlPFS0 zMUtyZ3~9coAtT8t%Vh8^72ZoJEMbS>l94scNlVYT=|fZcaU(~;S>S?8HrAD?L3VAb zgyU_p{ds+iJ%y9Hm#VlQ5(Yb#(|-9%=Myg3_Q%v}=@I&bbT^u1&0Ul*3H>XCe=Jx@ zI#*G?JryUdVoBnqEx&{zVNXYAH7Q%v$vWW`Tp0>_b*EE9MMEmaPEoH_G`MU=m2|9Y zLSrSITp&N;%Sk^i^w)I_H|zMhD9+e>ew2_<$q>n zeTpj6*LjimKg&mpAN-@8_YBiQ8+P&0Cw?LDVxXOE2WL8aiG9u9`;hJhpF7#s28$8w z8Q1JouW^6(=l7xvvp-I)UswSf9~xH(*a z7Oy!_z}iSdWL*L4im!fhhmVVdqDO62|c zjp_NFSrv)P619QR>3M81U>x)`mM|G3>m4-;pW@9`egaAxBL^fK|sa0!QT1Ty1} zAdWshzI{gO$BU>Vei%pb67iV!Qc3FZ3%v$-zT;dK-(pom7u(Fw m7R@Co!NAR+#lXj)%^=R8!ywO~$Dqbwz+lW^w7FSeHX{J}{1)K=