From dc56d43bc26480f9e1a8789dd9154b84c41bdeee Mon Sep 17 00:00:00 2001 From: GME Date: Tue, 6 Nov 2018 09:16:12 +0100 Subject: [PATCH] Clean for next tests --- .../client/FabricClientWrapper.java | 2 +- .../java/blockchain/configuration/Config.java | 18 ++++++--- .../blockchain/client/TestEnrollAdmin.java | 1 + .../client/TestRegisterEnrollUser.java | 2 +- .../blockchain/query/QueryChannelTest.java | 29 ++++++++++++++ src/test/java/blockchain/query/QueryTest.java | 37 ++++++++---------- .../java/blockchain/utility/ReadUserTest.java | 17 ++++++++ .../client/FabricClientWrapper.class | Bin 2981 -> 2976 bytes .../blockchain/configuration/Config.class | Bin 1263 -> 1313 bytes .../blockchain/client/TestEnrollAdmin.class | Bin 2371 -> 2371 bytes .../client/TestRegisterEnrollUser.class | Bin 2378 -> 2375 bytes .../blockchain/query/QueryChannelTest.class | Bin 0 -> 2175 bytes .../blockchain/query/QueryTest.class | Bin 5329 -> 4638 bytes .../blockchain/utility/ReadUserTest.class | Bin 0 -> 1396 bytes 14 files changed, 77 insertions(+), 29 deletions(-) create mode 100644 target/test-classes/blockchain/query/QueryChannelTest.class create mode 100644 target/test-classes/blockchain/utility/ReadUserTest.class diff --git a/src/main/java/blockchain/client/FabricClientWrapper.java b/src/main/java/blockchain/client/FabricClientWrapper.java index 5c7a13d..1c37e61 100644 --- a/src/main/java/blockchain/client/FabricClientWrapper.java +++ b/src/main/java/blockchain/client/FabricClientWrapper.java @@ -36,7 +36,7 @@ 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.ORG1_PEER_0,Config.ORG1_PEER_0_URL); + Peer peer = client.newPeer(Config.ORG_PEER,Config.ORG_PEER_URL); return client.queryChannels(peer); } } diff --git a/src/main/java/blockchain/configuration/Config.java b/src/main/java/blockchain/configuration/Config.java index 9ef898c..d5c4606 100644 --- a/src/main/java/blockchain/configuration/Config.java +++ b/src/main/java/blockchain/configuration/Config.java @@ -2,41 +2,47 @@ package blockchain.configuration; 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"; public static final String ADMIN_PASSWORD = "adminpw"; + //CA public static final String CA_ORG1_URL = "http://vps577432.ovh.net:7054"; + //ORDERER public static final String ORDERER_URL = "grpc://vps577432.ovh.net:7050"; public static final String ORDERER_NAME = "orderer.example.com"; - public static final String CHANNEL_NAME = "mychannel_mycc"; + //CHANNEL - CHAINCODE + public static final String CHANNEL_NAME = "mychannel"; public static final String CHAINCODE_NAME = "mycc"; + //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 USER_TEST_SECRET = "frwcKfCYPxWA"; + //PEER 1 + public static final String ORG_PEER = "peer1.org1.example.com"; - //TEST public static final String ORG_PEER_URL = "grpc://vps592802.ovh.net:9051"; + //EVENTHUB public static final String ORG_PEER_EVENT_URL = "grpc://vps592802.ovh.net:9053"; + //ADMIN FILE TEST public static final String ADMIN_FILE_PATH = "msp/AdminFiles"; public static final String ADMIN_KEY_PATH = ADMIN_FILE_PATH+"/keystore"; public static final String ADMIN_CERT_PATH = ADMIN_FILE_PATH+"/admincerts"; - - } diff --git a/src/test/java/blockchain/client/TestEnrollAdmin.java b/src/test/java/blockchain/client/TestEnrollAdmin.java index 3b27963..6441f7c 100644 --- a/src/test/java/blockchain/client/TestEnrollAdmin.java +++ b/src/test/java/blockchain/client/TestEnrollAdmin.java @@ -26,6 +26,7 @@ public class TestEnrollAdmin { assertEquals(Config.ORG1, verifyUser.getAffiliation()); assertEquals(Config.ORG1_MSP, verifyUser.getMspId()); + //ENROLL AND WRITE ADMIN adminContext = caClientWrapper.enrollAdmin(adminContext.getName(),Config.ADMIN_PASSWORD,adminContext.getAffiliation()); //Check Admin Enrollement diff --git a/src/test/java/blockchain/client/TestRegisterEnrollUser.java b/src/test/java/blockchain/client/TestRegisterEnrollUser.java index 45a6ae3..a512487 100644 --- a/src/test/java/blockchain/client/TestRegisterEnrollUser.java +++ b/src/test/java/blockchain/client/TestRegisterEnrollUser.java @@ -18,7 +18,7 @@ public class TestRegisterEnrollUser { caClientWrapper.setAdminContext(admin); UserContext userContext = new UserContext(); - userContext.setName("UserJavaTest"); + 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 965b073..2d32497 100644 --- a/src/test/java/blockchain/query/QueryChannelTest.java +++ b/src/test/java/blockchain/query/QueryChannelTest.java @@ -1,4 +1,33 @@ package blockchain.query; +import blockchain.client.FabricClientWrapper; +import blockchain.configuration.Config; +import blockchain.user.UserContext; +import blockchain.utility.Util; +import org.apache.log4j.BasicConfigurator; +import org.apache.log4j.Logger; +import org.hyperledger.fabric.sdk.Peer; +import org.junit.Test; + +import java.util.Set; + public class QueryChannelTest { + private static Logger logger = Logger.getLogger(QueryTest.class); + + @Test + public void testQ(){ + BasicConfigurator.configure(); + UserContext userContext = Util.readUserContext(Config.ORG1,"User-org1"); + + try{ + FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(userContext); + Set channels = fabricClientWrapper.queryForChannels(); + + logger.info("CHANNELS : "+channels); + + }catch(Exception e){ + e.printStackTrace(); + } + + } } diff --git a/src/test/java/blockchain/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java index 6af5304..98db2da 100644 --- a/src/test/java/blockchain/query/QueryTest.java +++ b/src/test/java/blockchain/query/QueryTest.java @@ -22,40 +22,38 @@ public class QueryTest { BasicConfigurator.configure(); //UserContext admin = Util.readUserContext(Config.ORG1,Config.ADMIN); + UserContext user = Util.readUserContext(Config.ORG1,"User-org1"); try{ //TEST FAILED - - UserContext admin = new UserContext(); - File pkFolder = new File(Config.ADMIN_KEY_PATH); - File[] pkFile = pkFolder.listFiles(); - File certFolder = new File(Config.ADMIN_CERT_PATH); - File[] certFile = certFolder.listFiles(); - admin.setName(Config.ADMIN); - admin.setMspId(Config.ORG1_MSP); - admin.setAffiliation(Config.ORG1); - Enrollment enrollAdmin = Util.getEnrollement(Config.ADMIN_KEY_PATH, pkFile[0].getName(), Config.ADMIN_CERT_PATH, certFile[0].getName()); - admin.setEnrollment(enrollAdmin); - + //UserContext admin = new UserContext(); + //File pkFolder = new File(Config.ADMIN_KEY_PATH); + //File[] pkFile = pkFolder.listFiles(); + //File certFolder = new File(Config.ADMIN_CERT_PATH); + //File[] certFile = certFolder.listFiles(); + //admin.setName(Config.ADMIN); + //admin.setMspId(Config.ORG1_MSP); + //admin.setAffiliation(Config.ORG1); + //Enrollment enrollAdmin = Util.getEnrollement(Config.ADMIN_KEY_PATH, pkFile[0].getName(), Config.ADMIN_CERT_PATH, certFile[0].getName()); + //admin.setEnrollment(enrollAdmin); //END TEST String chaincode = Config.CHAINCODE_NAME; - FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(admin); + FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(user); 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); + //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); channel.addOrderer(orderer); channel.initialize(); - String[] args1 = {"a"}; Collection responseQuery = channelClientWrapper.queryByChainCode(chaincode,"query",args1); @@ -68,11 +66,8 @@ public class QueryTest { logger.info("RESPONSE : "+stringResponse); } - }catch (Exception e){ e.printStackTrace(); } - - } } diff --git a/src/test/java/blockchain/utility/ReadUserTest.java b/src/test/java/blockchain/utility/ReadUserTest.java index c9b692e..15f837d 100644 --- a/src/test/java/blockchain/utility/ReadUserTest.java +++ b/src/test/java/blockchain/utility/ReadUserTest.java @@ -1,4 +1,21 @@ package blockchain.utility; +import blockchain.configuration.Config; +import blockchain.user.UserContext; +import org.junit.Test; + public class ReadUserTest { + @Test + public void testReadUserOrg1(){ + try{ + UserContext userContext = Util.readUserContext(Config.ORG1, "User-org1"); + System.out.println(userContext.getAffiliation()); + System.out.println(userContext.getMspId()); + System.out.println(userContext.getEnrollment().getCert()); + System.out.println(userContext.getEnrollment().getKey()); + System.out.println(userContext.getName()); + }catch (Exception e){ + e.printStackTrace(); + } + } } diff --git a/target/classes/blockchain/client/FabricClientWrapper.class b/target/classes/blockchain/client/FabricClientWrapper.class index 219bcf4c691176571d215063758979d9a1b7bde9..904b4f6332f8d96265bf963f5812a8f754923092 100644 GIT binary patch delta 23 ecmZ1~zCe7#XJ#(W+{)yP#Js%JoXt!ui`fBb$_P&Y delta 28 icmZ1=zEpg}XJ&rB+{)yP#Js%JoOmEBdGlZ9#q0o~Yztlh diff --git a/target/classes/blockchain/configuration/Config.class b/target/classes/blockchain/configuration/Config.class index 3e21f238a85e14c0b67101364a97d074e3dda741..49d6d950281202d935480e987cb06325ff0b84b6 100644 GIT binary patch delta 453 zcmX|;J5K^Z6ot?1x-cNoh+;yerGgI@@c};9-4Tee;DWDeV+@IffU&bO@gI;)?5(Vg zi6$0yHvSpoA242K#OCDQ@1C5SJM$HJh$cRN-rfP^Pzqxy3LUvHmV1fp?Fz$C%`2K5 zs|<$aRLd^M8pDVz{kqj?9M?RDBhN5wTYlf`A9@vz0s)!`Pk0KfGsFhKwW@++gNR+S zTvt?lMK&p!NZGY(jv$uq+qPs9<<ANQwWu_QfgP)+}-C(JpnXExhI*ECyZnsHcz)lG-%u1_iAhjkIsh zFU~rh)@AUb9fT&YTCHm{_|T?;as7_PpYQcCc9O&l3^0V~u{F$6#XvEnb3_(p4;ZOe cXiw5IPZ}Z&`jZ9Hn5+%5W~gH@Ni}4D0k=0)(Dxn4BAGgbLM)Mz&c^tG=fMQbiJm)1_Qp4p7a#hB&7d=W3;5e78BDp97i?- zMYh?QNy9N+OEN1(vYpt8ecO_~$^yHDY&=K-WxqH4$zSisGwMniKjVNf!&*h;sdRiL zH`qh%aMWl@Uc|Qr4#$ff%kvR4$3jzj{s>y(9X;vuD1>v`EV-er^|P7&ZSU%0Fu1%4 zxax(U+DTZ@A1L?orsv2e5V(P3k$-xbGjUE7U!gs7p`pZaGKM-9xK1kp7O})9;+9BN F{sY5LSY7}C diff --git a/target/test-classes/blockchain/client/TestEnrollAdmin.class b/target/test-classes/blockchain/client/TestEnrollAdmin.class index 5d5312dda3ecffb51eb8015ad106be73a90b42b2..98cb24a4f6674995b7a95e8447fd6cc428d31016 100644 GIT binary patch delta 14 VcmX>sbXaJE5Hn-`W?^OnHUK061K$7u delta 14 VcmX>sbXaJE5Hq9yW?^OnHUJ|*1HS+O diff --git a/target/test-classes/blockchain/client/TestRegisterEnrollUser.class b/target/test-classes/blockchain/client/TestRegisterEnrollUser.class index 623e0789fc3ef40c2702b5f095ec62e4d25defc0..ad314bf42942b9ad8fba7e96ddb4ebe02187d219 100644 GIT binary patch delta 29 lcmX>lbX;h|TPDW*$?up9xHv3Dy7r delta 32 ocmX>ubV_K$TP8;T$?up9czHsLQ;WP3%MwFUi%T|ZFw3(60LsM+H2?qr diff --git a/target/test-classes/blockchain/query/QueryChannelTest.class b/target/test-classes/blockchain/query/QueryChannelTest.class new file mode 100644 index 0000000000000000000000000000000000000000..df2ceb71ea70a998a3f5d3f0075fd10c07fdba02 GIT binary patch literal 2175 zcma)8Yg5}+5IrIW8KVSZAOvU%gf;;J7D=F_m=eH1NNY$4kCeV;`C6;;#;=9CL|t(QMHGsw&4`?g#%NRe9Lus*HkGBFXKAC zIPewRiDHvC`o{S+rEgu#4Ix$Y(|^(FRK(kw?^#YEJx%rNYrbLbE*qslD`0PnoRYU! z700*s#HLlYnDkl4aeYG~WIQcF_&XJnr&kjkpJLuZG81cV#WTgCC8=wFpNy1Dg@%vO zqv9J4-=arBPlQ6#b+)ZS#S47tOaph!JB#R{f<_tph+M1qPQ&;3LBXd{Vt7*els0Wx9LJb-^o{le)fNDvwW0j6Hsoa`%fVNBEOZM#t$gr@=&C zgTS_ik8nppM?h>qVVKmpie=|zi8N)FW>;1gvTMDQy&4KA%E8jGgIyK2hCMhe$8+_w z3ee!noODIPij=iXw}uklun0da5h;8!b?)FrZbz6bsP2f``}L&YZcVq&8D%!i87nSh zYdj^11b0NuvA`|=P~YIps`rGEj})td%s_1s)}9RhN5%IJTqz)5lE#AY!yadI4-8(_ ztxJocAbX)-#(qgtpNc6^9r3elaRtx*XE;}wt-cj40mF-~S0#@Mrc&>`q)*>UjARiV&`YQRj?}p{9pzRb##4s&()YM7%sa2T)$qJHWohlDUwKBF*E)(Y^uF~k^2dbMNI0XsWj$B>inokSIUhZ_x3g`Nv zV<>OAsG|zd5FFmXU9PoI0R8xcJH94Vt_zg^qOp3OJwHKRGM21AK|}T()U5}{h%XNx zp)r|AHXT7*;rjYy>{r})hvuzgv?OmHA=w!_LhBLQj?n%~DBtmx=9@5s48NDL0LTz= z1Fdw_#+wd~x9PeI_ZZC#R~g1KPe4nAD#1<@dK-p$e?I`(ivbK$`yO?M@PJn5`9F*i z-V%5>!&%<pfB7>W_S?3nTtp+-`>BJpkiyb=SmzOg$YLJ#@ffRoJkAr2cvA6{L0?uIl(Rt9Z^JpP0_`j$ZGGR)ZIK(TU!m*yuQ$6fapBTC29j+M{hw zq;8>OD>_YHWrwxWQ<6K3ow7G?QT3dvXf#r9vWwkv zj>#VOn(X5>jr94ENMnihnXY>WN8~alAM%mh$mC-_G5M6wH1aLY zoo|?Y&QV7kv$FL-248U8WEfwXe8ty}^^M6;&b7wtx#@h%cP8I+T=9d+kDM_1Nyu2L zXJ_&=zi6b@RW(Z_tPp~#>cV0VMn;1!iMS8jxdon_7vpazE zIA1)C3nV$oNlt3UMXId*(Ls{m<#%`Bnc!CwJJBoi+wo2+^c!{@U)U9N*_dH>p-r+s z#h+@E7WQ;GJ^g;0Gs3FNIn&?ECOxbN-9e8{V47%Uli_IHCMen_bDC=hS(QEfXH5xv zgRTO9@1WNvJ8T4vZRBW#eL>$g&er4wRXSFmxW;b!hRvX9b51xpm~7LpCkI+c>!g3B zvpS%ifx9}TsN)Q3CpVn3mAp>!E88jX3$mhMiU^yKP4W8E>(--BEU+nQ6E1wx)xyk7S#>5S-korbBwQ;?<8hy6Ii}(| zMU`TfqFOOq5m8*Ps8P&O)GF$fkiwq~QPeBuofbBex^rN(BI=?+sySmiU$o8*|4wut pS#v(GzqEtFi9+(6v6jgY**(^Nf!ruw5(|V|1eqq6-pr`-;NKGLMS=hT delta 2166 zcmZXV33yc16~})!naO?g=1rED1>X>bC?Wd>0mGnZfM7wEQm8cAVuvu0fypE!fkL;@ zwrX3dt$lQ{i`3c{Yiki=Ux3u5yP|EetJW@7?XI?Tvm4;K6RG*^eBV3UJ@?*o{^#5? zx6XRBA$R=rvHO5dRb_K2du`swjhdTm3fZf9zvcrLH`|2ypdr4+K8y8c^+OgPHvA)o zeAF!7V)HRRZq!d$d{T3(O$GZcK4tiAHlOBpBYno=vlgGTIlvuOj?Y`%Y2+_he9_`A zBYw%|Aa@&b$dJQ^jA`z%__9S{4jPYggriZ8F=5D8H22!Ha-Ypg?$?#X4UeAPXyui> zXEc=^9?WFAC$FgU*T$;tp1f%wl^q>hP;ig(D?&RuACao$3(~83RKO5?HQ(3#K=VV* zk2F8lWHdj~JSJ#pP6!PC-JvU^OIWIT+~KDz^#eUK=1h&*uME%1O&b^)YRd;;f*)zy zp4u}qIyjtiSi%zyKjY^L?-f3INK6(Z4!__DMQF|N)((eXnjKFX@++RwJnirdzjpWy zzZI8(J$-$O+D)0kzU_Ve$#k}@FOyFBg9TOd%w4||M8%~)na!p$R~u)C-}47a)8UUi z>+l@UE2@T4sp0n4LAlPaDXRCn+UIp>{^amyPAcrwE`hCo=ce`!zon=;BCB&9{=#4V zX+>S}zwviL%;6ur;P6lW0hI}RILOsJ@#^AC}#V&70mWe z>68B9*g5MWne@nLzI=+Z`iB2&KRuEfU7Z||*0e-gH8Qk(v!E?v_m(Z`Ogd>om#nv* z^{S|E@K34=|9LC!7K?TA=9KA4McUu*)cQ}_u6z~#!AP`j=SXU}ZAteOFL@0yIeu!y zjrFFxrzEkk;fk@1k&8oP$73xjw@3yMNC^#OA{B}(%`3D=v^L>Nc(`#Kbx4E)mI*D& z8_T#%WM|TWSFv0)#R}P6U^W-F%6O^}(~2V$Oi;a*pdW36fqh^(H-8Qm5= z5%NM}Nrao+Xn@n?#sZ4-w8Ygdg>wQ*UE2%ig(H+DikiHl0M{)~=m{!%o5rb3Sf1rp z1x!msyhy+~3EQ&*JU8x652#K=C$)3k^8#ihoJlP=)2#_OKN0h6Pwu^7gK#Hcmf;dX zt?+=^8$$O|*IVe;uS*nr5l_1fUU5KUqQomXN|Pc{>Xja)S#b-!Mru(!Kx?ARD+_2# zxSku(UdDs_DV?CB*I4I_Gxz=p>T-FlbDVjJ^25xZ;6j0^%UuwV@XCb*EDX5lz?s_* zV6AKlxcHDjT&TL$QW>0~d@*j~0s+2CDt8`HW>CpY;?z*f`83Pg9Fe-1ErYm@_0)5v zSU1u_zYOUeIojDRM_tcc_AyVU{Cw_|>3mqW9Akl`aS;#8*2lPn7o=5A)2$*bR#ozd zX3?V-u}pPyxrDP^^{_%MXLY_Sj!WfFi~r@U!4=OquVyXfa>ix6hINz?Rr4jB+-oJD zO4ZC2Y>>8zt2$msujEpzswL75l4G-~zN?M7Qtm7cd=Ex9Z7LNX|@rQ#CGM_PKIL1FUK!lj`J~q{C5(t=J>fGlaLY8Knw^?mnm3)LyES_>Z`Qm;^H$BP6An7alXZ{|mF7;jn7a8PM diff --git a/target/test-classes/blockchain/utility/ReadUserTest.class b/target/test-classes/blockchain/utility/ReadUserTest.class new file mode 100644 index 0000000000000000000000000000000000000000..e29c3d74246216d94e90fd06d3df60a7d0287f4c GIT binary patch literal 1396 zcma)6$yO6V6ulK99YQl0aUKvyf&;bQy-{};gpwpexsrJYhxz>f#!les; z$eqVqokW9jj`pJJy?WEV?^X4;AD_PfxQ69C3OH@yOb%yrn9QSysR5kB`8+P*Vjd1I z8R@cFt_rSA#!O%_)LvZbgd1x8#I%EhEn zmGKL&8t|mxM!pxUda*Kk=P;|+RZC#Ptp<_5>92b#bP}xsrMH}A>D6Ag7%y9zbw)M! z?%7gYzbr7A&|Hc_EnjPaquY|u;+W`;nF$0z>~%N1SDq7iVcnT~?aQWCQApd+iuU}? ziq}kWk)puCVio6BzH|=||z3swZ)p)FDo4>>o3e+JM1+!N?Y7Y}~~?3-@h2z^sLbHcBX4n6ojD z1sji0w(%HGEIhU08l{3oV_UNE3}t~mJCL^V{7*nTHJ)652QO7Oq|Z+8?_tpmddaDA z>~Uvkzot@}>}mOmj#XHn{`;i(kJHKyjiPQh(NIkRl%oOrm2azL`0)}t|!~Erq;0{JnCYJ?r zdqj&%U