From 74821e5056cd11f1f967a67e9b281702fb1ecb62 Mon Sep 17 00:00:00 2001 From: GME Date: Sat, 17 Nov 2018 11:21:49 +0100 Subject: [PATCH] clean code delete unused class and code --- src/main/java/blockchain/utility/Util.java | 50 +------------- .../blockchain/client/TestEnrollAdmin.java | 1 + .../client/TestRegisterEnrollUser.java | 1 + .../query/ChaincodeTransactionTest.java | 65 +++--------------- .../query/CreateChaincodeUserTest.java | 36 +++++++--- .../blockchain/query/QueryChannelTest.java | 1 + src/test/java/blockchain/query/QueryTest.java | 21 +----- .../java/blockchain/user/UserContextTest.java | 1 + .../java/blockchain/utility/ReadUserTest.java | 1 + .../java/blockchain/utility/UtilTest.java | 1 + target/classes/blockchain/utility/Util.class | Bin 3819 -> 3819 bytes .../blockchain/client/TestEnrollAdmin.class | Bin 2371 -> 2371 bytes .../client/TestRegisterEnrollUser.class | Bin 2375 -> 2375 bytes .../query/ChaincodeTransactionTest.class | Bin 6700 -> 6891 bytes .../query/CreateChaincodeUserTest.class | Bin 3107 -> 4750 bytes .../blockchain/query/QueryChannelTest.class | Bin 1842 -> 1842 bytes .../query/QueryForChannelsTest.class | Bin 1476 -> 0 bytes .../blockchain/query/QueryTest.class | Bin 4638 -> 4638 bytes .../blockchain/user/UserContextTest.class | Bin 1047 -> 1047 bytes .../blockchain/utility/ReadUserTest.class | Bin 1396 -> 1396 bytes .../blockchain/utility/UtilEnrollTest.class | Bin 1388 -> 0 bytes .../blockchain/utility/UtilTest.class | Bin 2164 -> 2164 bytes 22 files changed, 45 insertions(+), 133 deletions(-) delete mode 100644 target/test-classes/blockchain/query/QueryForChannelsTest.class delete mode 100644 target/test-classes/blockchain/utility/UtilEnrollTest.class diff --git a/src/main/java/blockchain/utility/Util.java b/src/main/java/blockchain/utility/Util.java index 82db643..6fe9074 100644 --- a/src/main/java/blockchain/utility/Util.java +++ b/src/main/java/blockchain/utility/Util.java @@ -1,23 +1,13 @@ package blockchain.utility; -import blockchain.user.CAEnrollement; + import blockchain.user.UserContext; import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; -import org.bouncycastle.crypto.CryptoException; -import javax.xml.bind.DatatypeConverter; import java.io.*; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.security.KeyFactory; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.security.Security; -import java.security.spec.InvalidKeySpecException; -import java.security.spec.PKCS8EncodedKeySpec; -import org.bouncycastle.jce.provider.BouncyCastleProvider; +//Class to Read and Write user / admin to msp directory public class Util { private static Logger logger = Logger.getLogger(Util.class); @@ -97,40 +87,4 @@ public class Util { } } - /* - public static CAEnrollement getEnrollement(String keyFolderPath, String keyFileName, String certFolderPath, String certFileName) throws IOException, NoSuchAlgorithmException, InvalidKeySpecException, CryptoException { - PrivateKey key = null; - String certificate = null; - InputStream isKey = null; - BufferedReader brKey = null; - - try{ - Security.addProvider(new BouncyCastleProvider()); - String keyPath = keyFolderPath+"/"+keyFileName; - isKey = new FileInputStream(keyPath); - brKey = new BufferedReader(new InputStreamReader(isKey)); - StringBuilder keyBuilder = new StringBuilder(); - - for(String line = brKey.readLine(); line != null; line = brKey.readLine()){ - if(line.indexOf("PRIVATE") == -1){ - keyBuilder.append(line); - } - } - - certificate = new String(Files.readAllBytes(Paths.get(certFolderPath,certFileName))); - - byte[] encoded = DatatypeConverter.parseBase64Binary(keyBuilder.toString()); - PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(encoded); - KeyFactory kf = KeyFactory.getInstance("ECDSA"); - key = kf.generatePrivate(keySpec); - - }finally { - isKey.close(); - brKey.close(); - } - - CAEnrollement enrollment = new CAEnrollement(key,certificate); - return enrollment; - } - */ } diff --git a/src/test/java/blockchain/client/TestEnrollAdmin.java b/src/test/java/blockchain/client/TestEnrollAdmin.java index 6441f7c..1101fe3 100644 --- a/src/test/java/blockchain/client/TestEnrollAdmin.java +++ b/src/test/java/blockchain/client/TestEnrollAdmin.java @@ -7,6 +7,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; +//Test to enroll Admin public class TestEnrollAdmin { @Test public void TestAEnrollAdmin(){ diff --git a/src/test/java/blockchain/client/TestRegisterEnrollUser.java b/src/test/java/blockchain/client/TestRegisterEnrollUser.java index a512487..db7bc3c 100644 --- a/src/test/java/blockchain/client/TestRegisterEnrollUser.java +++ b/src/test/java/blockchain/client/TestRegisterEnrollUser.java @@ -6,6 +6,7 @@ import blockchain.utility.Util; import org.apache.log4j.Logger; import org.junit.Test; +//Test to register and enroll user public class TestRegisterEnrollUser { private static Logger logger = Logger.getLogger(TestRegisterEnrollUser.class); //Success diff --git a/src/test/java/blockchain/query/ChaincodeTransactionTest.java b/src/test/java/blockchain/query/ChaincodeTransactionTest.java index f6776b7..2de4bac 100644 --- a/src/test/java/blockchain/query/ChaincodeTransactionTest.java +++ b/src/test/java/blockchain/query/ChaincodeTransactionTest.java @@ -17,6 +17,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +//Test for transaction public class ChaincodeTransactionTest { private static Logger logger = Logger.getLogger(ChaincodeTransactionTest.class); @Test @@ -33,49 +34,26 @@ public class ChaincodeTransactionTest { 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); + //OLD PEER + //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); + + 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"); 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("b"); - args.add("a"); - args.add("5"); - - String accountFromKey = args.get(0); - String accountToKey = args.get(1); - int amount = Integer.parseInt(args.get(2)); - - System.out.println("args0 = "+accountFromKey+" -- args1 = "+accountToKey+" -- args2 = "+amount); - */ - - - /* - String[] args = {"b","a","5"}; - - Collection responseQuery = channelClientWrapper.queryByChainCode(chaincode,"invoke",args); - for(ProposalResponse presp : responseQuery){ - ChaincodeResponse.Status status = presp.getStatus(); - if(status.getStatus()!=200){ - throw new Exception(presp.getMessage()); - } - String stringResponse = new String(presp.getChaincodeActionResponsePayload()); - logger.info("RESPONSE : "+stringResponse); - } - */ - TransactionProposalRequest tpr = fabricClientWrapper.getClient().newTransactionProposalRequest(); ChaincodeID cid = ChaincodeID.newBuilder().setName(Config.CHAINCODE_NAME).build(); tpr.setChaincodeID(cid); tpr.setFcn("invoke"); - tpr.setArgs(new String[]{"b","a","20"}); + tpr.setArgs(new String[]{"a","b","20"}); //send 20 from a to b Collection responses = channel.sendTransactionProposal(tpr); List invalid = responses.stream().filter(r -> r.isInvalid()).collect(Collectors.toList()); @@ -87,31 +65,8 @@ public class ChaincodeTransactionTest { BlockEvent.TransactionEvent event = channel.sendTransaction(responses).get(); + logger.info("Event transaction id : "+event.getTransactionID()); //print transaction id - event.getTransactionID(); - /* - BlockEvent.TransactionEvent event = sendTransaction(fabricClientWrapper.getClient(), channel).get(60, TimeUnit.SECONDS); - if (event.isValid()) { - logger.info("Transacion tx: " + event.getTransactionID() + " is completed."); - } else { - logger.error("Transaction tx: " + event.getTransactionID() + " is invalid."); - } - */ - - - - - //String[] args = {"a","b","5"}; - //logger.info("LENGHT : "+args.length); - //Collection responseQuery = channelClientWrapper.queryByChainCode(chaincode,"invoke",args); - //for(ProposalResponse presp : responseQuery){ - //ChaincodeResponse.Status status = presp.getStatus(); - //if(status.getStatus()!=200){ - // throw new Exception(presp.getMessage()); - //} - //String stringResponse = new String(presp.getChaincodeActionResponsePayload()); - //logger.info("RESPONSE : "+stringResponse); - //} }catch (Exception e){ e.printStackTrace(); } diff --git a/src/test/java/blockchain/query/CreateChaincodeUserTest.java b/src/test/java/blockchain/query/CreateChaincodeUserTest.java index 7f12805..cac587a 100644 --- a/src/test/java/blockchain/query/CreateChaincodeUserTest.java +++ b/src/test/java/blockchain/query/CreateChaincodeUserTest.java @@ -6,16 +6,18 @@ 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.apache.log4j.Logger; +import org.hyperledger.fabric.sdk.*; import org.junit.Test; import java.util.ArrayList; +import java.util.Collection; import java.util.List; +//Test to create user on chaincode -> don't work, can't use function "Init" public class CreateChaincodeUserTest { + private static Logger logger = Logger.getLogger(QueryTest.class); + @Test public void TestCreateUser(){ BasicConfigurator.configure(); @@ -27,19 +29,31 @@ public class CreateChaincodeUserTest { 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); + //OLD + //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); + + 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"); 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"); + String[] args = {"user1","200","user2","180"}; + + Collection responseQuery = channelClientWrapper.queryByChainCode(chaincode,"init",args); + for(ProposalResponse pres : responseQuery){ + ChaincodeResponse.Status status = pres.getStatus(); + if(status.getStatus()!=200){ + throw new Exception(pres.getMessage()); + } + String stringResponse = new String(pres.getChaincodeActionResponsePayload()); + logger.info("RESPONSE : "+stringResponse); + } }catch (Exception e){ e.printStackTrace(); diff --git a/src/test/java/blockchain/query/QueryChannelTest.java b/src/test/java/blockchain/query/QueryChannelTest.java index 2d32497..4f3d4b8 100644 --- a/src/test/java/blockchain/query/QueryChannelTest.java +++ b/src/test/java/blockchain/query/QueryChannelTest.java @@ -11,6 +11,7 @@ import org.junit.Test; import java.util.Set; +//Test to show channels on a node public class QueryChannelTest { private static Logger logger = Logger.getLogger(QueryTest.class); diff --git a/src/test/java/blockchain/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java index b5af101..11aebb3 100644 --- a/src/test/java/blockchain/query/QueryTest.java +++ b/src/test/java/blockchain/query/QueryTest.java @@ -9,11 +9,10 @@ import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; import org.hyperledger.fabric.sdk.*; import org.junit.Test; - -import java.io.File; import java.util.Collection; -import java.util.Set; + +//Test to get balance of a User public class QueryTest { private static Logger logger = Logger.getLogger(QueryTest.class); @@ -25,29 +24,13 @@ public class QueryTest { 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); - //END TEST - 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.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/src/test/java/blockchain/user/UserContextTest.java b/src/test/java/blockchain/user/UserContextTest.java index 7aeeafc..7d0133a 100644 --- a/src/test/java/blockchain/user/UserContextTest.java +++ b/src/test/java/blockchain/user/UserContextTest.java @@ -4,6 +4,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; +//Test to create a User public class UserContextTest { @Test public void TestACreateUser(){ diff --git a/src/test/java/blockchain/utility/ReadUserTest.java b/src/test/java/blockchain/utility/ReadUserTest.java index 15f837d..e3ad3f4 100644 --- a/src/test/java/blockchain/utility/ReadUserTest.java +++ b/src/test/java/blockchain/utility/ReadUserTest.java @@ -4,6 +4,7 @@ import blockchain.configuration.Config; import blockchain.user.UserContext; import org.junit.Test; +//Test to Read User public class ReadUserTest { @Test public void testReadUserOrg1(){ diff --git a/src/test/java/blockchain/utility/UtilTest.java b/src/test/java/blockchain/utility/UtilTest.java index af9979e..a6ac75f 100644 --- a/src/test/java/blockchain/utility/UtilTest.java +++ b/src/test/java/blockchain/utility/UtilTest.java @@ -7,6 +7,7 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; +//Test to Read and Write user from files @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class UtilTest { private static Logger logger = Logger.getLogger(UtilTest.class); diff --git a/target/classes/blockchain/utility/Util.class b/target/classes/blockchain/utility/Util.class index fe93204fa2e4863692cdc4dc9aa01616f0959310..933bc8902f1d500332790b2ce7a731da1777970a 100644 GIT binary patch delta 450 zcmWO2ODHS=6vpxY88k5@kB~<$<2e(PnLKV>*P9scXZI>85evma$%42W8w=`YV<9Oi zp()uY*;rU8DPd`$%)-Lbf^U0Hzpw9{a8@|$H62g@7P8lEg`6R#>mFA$_BB(GY zRTe{@xyZL93M`dk%b3AqZoF2A&pecvms0alW&!+GO~8IDpg{qR3TRb8J4F^0?2#Lh z8(suUavC&gq?IOmY32_d zj1gplZvCN?X}XxzW}ZG47}QVtSz>?{hFF#QM;q%h8!}rm|7Esic4T&C_GJ!a4rPx0 pLZ`G75;zyQ5V#b$61Wz)5x5n&6Sx<6WGM6y7j3RsOwCaHzu&%?QAz*+ delta 450 zcmWO2J17JI9LMqR|Bfy$laM%h%k$(29eEYRzRf{Qe|HJ=A*{^)LNYa8Wqr_fEER`QDz;2J#xcx<8lGH zDY+TBdATLIWx0^tirkvq22J6|*dfPiGY(paqE+{{>7sVE?@-fDO}pr&n^6V`Fvv6` z`oj=&470!(ON_IuO^69rm}HG0>k^yvu_d!Dvn#VFvoCWXb0~8xb0Tvpb6zHNNk3tM kYk?bqTY)=)dw~amM}a4SXMtCO;g`4=b0=bIhT4z)18P21ZU6uP diff --git a/target/test-classes/blockchain/client/TestEnrollAdmin.class b/target/test-classes/blockchain/client/TestEnrollAdmin.class index 1e2c68b405303e810f618ce7dfed525c0da03cb0..e3230188670997696bac2204504acc70cbf285cc 100644 GIT binary patch delta 91 zcmX>sbXaJ^M0Q5*$&=V$d-5?bGYBy7G6*qsbXaJ^M0Q55$&=V$d-5_cGw?I;G6*t=G6*q9GYB&%GKes!Gl((hFi0>MF-S7l tFi0`D0c8RhPEBKEKVZlFnbX<2##p-2Ht|~jr7Gggdu#|B%1VH t^1b9@Q<-34W@D~WI9fVcIa_P~dsDjGdN^q9boQRA{xyE5smK*0^$)No4Ql`Z delta 91 zcmWN`Ee=3n0D$2a!QU94`5!i#rYS~r4%tO)1QR7Ua0}UuXwUXM;t}_%O8T*>Z)c<6 pVBz8;NbsnB)dVzzv_y==O#jTJEEKF{Y~<{e$EjVWfkY3;3?Ho74OsvH diff --git a/target/test-classes/blockchain/query/ChaincodeTransactionTest.class b/target/test-classes/blockchain/query/ChaincodeTransactionTest.class index deb57c0aaa353ea3b6dbba888891604cdeb0574a..61693cfed4c1c9eb4f0694c903a0b4ea08f3b2ae 100644 GIT binary patch delta 1844 zcmZ8i2Y6Fe6#h@!6WwcZU2RK6;+LV%nG$1&LI1v~4 zL~-FjWC$v)1_Z^4C@#c}GF+$>abVqo=e7v_`10kRbMHOpKmQpwS?la93~fKMX$t@+ z)$16Ag*tA=EdsY{xJ|?DIu>EEhC2id9UAV`utdqbbli=lO1nqHy&CS*aX%i=uuQ{) zN_|Mf!x|n@>T(^AVue~BQ_D)VtWp=Nb*#bTdI)Q=PUqzb9Z%vZ4eOO`7wFLNw1#Ii zgw??Y<+ss_XR*o7Y+tnECA_TT6}+mntpcxEk%Mh^5Z+YUTgv`z9q-^>f%hz^z)pep zbrfQuh7XkdP)7ki(z96oSjQ*$RA85m;rL9)=h&@I_9$(yz&^G4Lg34eSW1mb-zV@D z)8mo|d@b;ez(f zHGU>oX3TA9c6q(-R*7G5m?0&8MVG{H_??jGce?|5xxPSCzOhcE%i_Gke1ShC{={F# zOwrfaCSojnSRnB?{xOz|;?Tc1!lWdQ5+o5tNQ$H=NhZc5GYMuWNh4j5Rg$D=Nih`5 z%q7{V55es5&h|}rOR`fO!PerM?Q*obyiJaY!GOoxL?9P`rxGHDoV#r!6Sy3`)0A276}OFkey@WlPGTTuBbf6O=D$2o(r&5{kG$j^??3cc9hi zH1#nKX#GMMjVeOY$r)76^0YR(1AJ38+wBdeF;j1wt0Cy|dDA?NX(efr3aLoaP%4%* zjEV)7NGhcaLfi?csyPjAzjBc@ocl{7B#l(|Wt1VQoYDyyMx`YyvVtl*{1%gzHi||Q z64Gl=K-5odaW@1@Gp6XMpsJ1~eTs?At2=hsQ%N_w{C>B$k&t6lM8~CM^z!TJ!?7$% zjn262OfBg9zdK2)5H7!~q1o+d^))$L9JRitCY5fK$2-kuB*fPn^Wy7mHIl~Ac!}${ zBe)v#jotBuRA@Uw%MN42dIqraNG9<6jOq>*KtF~}MkGrs(im_6k}wecF$jZ^$xk~A<;do+IXDNo zxQIEsk%#GUBFImEK8mmaLlIhpVys39+EI!f48IE_u%DCf!f3K%42P_yMAT3UhgEqk zMJ!?{3KLMz`6ThPI}>Lyjs7@{voVqB4aPxC;-Drbu@~p!Jg!SQcH(?YhG0TlF$EX! zPiGLzaAAmZMKQ7K`2P!cY4P3}Bq@oc`h-M;DXoiOabNP;y)=D<%A=NNgxs{n=j0~gf#7O9hD@Jl=WxdA2ifeFf zHw+ITLMIPZ80Bl(tM^cq_VPC22Ib8qyz%%%4(O%;SnL%WQP}~fqCmZ-GLd_)fgGaIN%KF3DSV+&sB)?UXO*!~|&n{+n- delta 1644 zcmZXUdwkDj6vy9Zm*4aKeSZ&Tb}_Rd3>*8IZEWV+MJ0+$27h1RvXC2n2raI?!T-0HB%;Wi)M z?r?|0Vjte=au;{|%RT;bufN>qU)=BV01vwLEMcju%R?>?^N7Qv{=Urcn8R|1#~q&V zKdkWmR)%Qc$#_+}Cd68vaaqTDA8jx^8=?mr;}Kr;(M!Jl%Pz0*s^K-4TwXV9cFE_B zAVs|C@)mEqyhF=(efXYXi+_6G@Iga2NsH;a#qgnu(8LW}4ciPK8MYffHhg0E)bN?c zRLX|R*dY=c#9+e?%jXRCHUx45Us%56D{o&Qr(_U2h2W&=rRBwym5~a|*Lh6(f!}&`D}rB1o|i)vKqKptx2-VznMtnn`nS zvXfNOB2MC31f*pg^;Y7gm5~H1iIQX_*-C3kvC>9Th2|5A>x#ouYsXiFhmD_7Yo)EE z#Ywt)wu@t?mG;uX$}!T>N+;=TB*RJ<>1w2#(A(P)mFf*haJ}Zi_!!BQEUzlqI;}f{ zEdv;6q=%Jk$ubhQ(o@o{P=aP23hUQ0VM!OiK4wC1s5((y2n*()E=oidC%bqU*7G3hOTZ*UVMO3I$Od zr)!|;V*e-%TIwB@O@BSIz<8A>guFpFW# z)7u4{sslNKm5kKMIh}2cVkcwj*~>W^aH@u!!a-^!n!2V07STe3?dBv-R^iDy8AFvW zS_5xa%Hb+6gDpyWnx>Ph6FWkQ11e>$l8?fu#d6M2Nsh{x%UO&jsA6VtHe#$-BzUpIGgJl%wz<9S~A2WbpGfB*mh diff --git a/target/test-classes/blockchain/query/CreateChaincodeUserTest.class b/target/test-classes/blockchain/query/CreateChaincodeUserTest.class index bcfa8fe9e39afbb6091120068c0d5ef63779663f..d18a495ddb4b7e5e1eaea23277998f621e007ab2 100644 GIT binary patch literal 4750 zcmbtY2UHx_6}^KN{xA$kUNx^uBy1IsfCUw!EJTsO$dU~L3zZ&I%Z}a|p@4t87 z`|t1BbEoeIunGUsumwjojN?Xu7pi!XiWh5m30|t=WdbkPpyCxOUMc%mX*h;g%h63L zZdUOc4X?%PRJ>lr8|3hfD&C~x&2o5)hPU9YvU!_q-Y%PW2)t9pttxI)al49lsd%?! z_?{}f7k5hAZ(Qfe*{caSe6&h#Y-X!%}>#60P{Sz$Y{`;i!tc zWdBLod`iRJI3cO;5x7@QJ}vMWft-ShgcFZju7XInJ-4M7zCDZ6s>9 zlXhmSf;n~d`xS&bogquX+-^H*?aq!3TJBzBFu|2@w__TK{f2AHd44gJ8Mf03)^!gi z9COqhHtb~d`mE)SM>}21$XK0n#U#glX)?0X849eCz5iLRQiF8H$Yj$3Cpqr-#tQUZ z$)x3WCX962qJ+)f35Lg0mYcAKc&O-MW6-tDXnJTgIw@t3l}3f6SkGi9B_>k zHC3>-*f6H|ExN-~d>SEnEg&zRI5BNqL0t(3Jnk$?au9hA3RVT3Bfr}_wIy||4WjNN z2}xD!2#>WhJE&lF5P4UgOseC!LzXKA1gg{PQ%Q9UH%=$aKUB&?)pU^O+G{1c6fE+I zvKc!O?Q{|e%goqLl3Wz}Vqp=7uA`=v%6|)GJ-jV1wy9i-N*s1N$&7VW0(8-Iq!V*_ zw0D&h+8$((S*Y1c0o8=3Ioe~SJicDEo?@n8?h!aGa7N&>0{02rFK|%c0f7gZAs8M^ z4UFYI*<{8Zv-aC*n}N7JnRFO3JUneT&r@Y2%YcsNqfKom?EC=N`kkz6T03kR&dV+k zpiMG7bhM#e;Bz`2Lc4+$MbT|K$-{O$>v|$-dO4%-m|t2Hlp8~1c2eN;I=+A}a(Qgr zGzppF{TB=ZDfCMWD(>+CuH#`mLW}75GS2Gw3cgC;qzK67CMmATI%}Jxj44ZrZ5h8~7#x znFsR4%4==j+^pkU_%=PM<2(4Sj_=|7I(~p3>i7}P(oHi{5G^NhNR8%fXl~BWHgMLm zg|m?KpN=2nCj^6zpWB7Eh7;nX@BnCm7=js`hmC_x0}X?^+pKspC)hvyQ*uae=?; z_#6JN;~x@5ONvn7-w|FcOPuQXC;r7`H;du|Af0By-oX(@zrep0Yz#02^PYbd6%u&< zl2EX;NbJmXpkPhW*L()gr_dRx`m$i*GG#NA0*GX;Rd9I#MIpT^2ojc0sk~D>ht0^5 zyaK0|cV#R_vO}>R!)X;lhmp2TKfqgt2? zeV&fHD&;OO*|7`=-n4UvPsm+C-Y<~xZcSP@_-MJR#L-GwHUL!lE53?6r|@;n)8|`Y zCM`(blc>D<>9d|H8iX-4G--*aI^;!qu8KSh$}6BH0{9l_+Afl}M&8Ai2w+_}>C-J^SlJxG43TjzoPHGD6^L+zUoU>J@l$-PiBur1o-T%LK-n_q<6Ed@}3t5 zd6y-<$$|pCSBLu6~2nklE!&ZI6{s8*$oWy1dD{e_;um z$TU*xN4$SuZ1+mbf|x#IJmDBaJV{;sp$=Zvb%#3SmI_(%C%N8Ois!75%wL_-iW$e( zhbdK}VOkFMUuj+maM)pCTg*FeH7R^`~mOhK-`C=19QU5 z`UgVc<^2QY;b-&@RD@Ub$0{SChVaTrWe&A5Eux*mWeQ?dk*ZU;T)}M^kfT)!9>nUH z9?^4H6RVC?=dkt?JaPx-ok87zT&E?nQ#P4Xs*Sy_oe)@6g61J*>bGl{~G>ou#xRH ztVIv%u@CET9oEA_14j9y!7()B7PRokf(@7;@YEmx2PVA!8yE(ra*U*hMEd9Em7PE)u25Tw2f2k;#J(sB%04B#LtsiBQScrKB3j{C2}^T?TC;4TT2 zD*O-6#|vl|gEI*tpMH?^CRcW%{5)=lE-)lu2^V;PJwS(m8$z1gBw#b_Rccqjb}iTBUuAgnNnCL+8YRA!B7D!M!biAPh8wVh Oy~eLs(uiH#BL4^QC4r;> delta 1088 zcmZXTZEqA+6vuyecDHwSb}Y@3wqRS90xg2I`%nvgzzPB?vK6%jq!!9_JGM)g?XsP& z)(2J;1VsTE)Wi@aQR8dUL=Y1bUho2a?I-YisAqNwCNeM1Jr8rv|D69l_fpsQYpTEh zedjmeX}-4TB5N_q%bEiwub8}Q@fu?$XA{xf zoRcr+7G_*UJbS{aILU%joK22-<$Q5=cxBSqubP_bfh8|rNM`ekp8r>9YGl*@oI4)P z9vN0VHs(3G`BA4d?o1cl8gfPY@b87wzKZn3y4kFG%jRu1`vZ}_hGm;~c-KD_NpI=q zJw^27vb0z%x&@o}IjyPMe83r-5BW&ZQgYpL+W#Yx$PQ)(QkmX`%3N>J^@avh{b|iv zn{#}uu-uAU^yZePQ)xxVY`K&hN+v6%#r{W<`fSc~!Qa*}F#ZXjYA)J*#^*MdxNLKU zFKn)IMzOlaRE>~b<+8IJu%d`8ElM{U-{u-$Dngl5>VY>SR=PjsH|aH@uVmC4dL*Q1 z^JC$*mG)?dQr&)&)xEOa`d0bJ&90R{W38&W@jsM0K**Vy@$WXaRwopzN^(P9jotCG zlXK~0lk8aV87PETkxz(~lvBwW*?J3gvliYWvZ3aTvsHAv{sT|aBbMSRNj8FHb%zj^ z_

N5f8^Bw`s`6wSRxrvFfk19l1sOP;_lH-ti0T3=WHyc&M#^sCCx0pD;&zerDrM zL5Ojk?_?Ll1iehqBC=VqS|qZTMjoeCb~r(Y46=?s(RQ+4UQZ_nCF>{~sk$=nyo5bz z_Ovv6K}ubfajw%VrF*y`WBee~2LqO*Y@=Lauh@o^K1YhQz$Ij-GEzP)bt>{q`-zB^ zXB*pvpq)%Iz#v+H4=}{Ayh%@xcJK_*DFFyG!n0CP_<6uxjBg}umrVGacmrPR3A>51 hM?9-B{*mqs&0fv(D9sCDUX(y^9sA@|yd=_K|G#L~%~}8e diff --git a/target/test-classes/blockchain/query/QueryChannelTest.class b/target/test-classes/blockchain/query/QueryChannelTest.class index d870eec0483b7c76952b9ffb8d961678d3623f38..c92b0e80d41a6bf83d4378c1281b4c7f0d1ee1c5 100644 GIT binary patch delta 63 zcmdnQw~24V8&*dC$!}S!6h#=A8AKVl86+4)7$kvEn!$)cp23tsmcficj=_pSadHRS Rd~N{-Mh0UB1_mYu699)O37G%@ delta 63 zcmdnQw~24V8&*cX$!}S!6ona>8AKSk8N`941cM}l6oV0i9D^x?41*biEQ1w;!sHIN R`P}>rj10yM3=B*RCIE%K361~& diff --git a/target/test-classes/blockchain/query/QueryForChannelsTest.class b/target/test-classes/blockchain/query/QueryForChannelsTest.class deleted file mode 100644 index d9e78fe5132288bb2721eb42788500cb3116b1b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1476 zcmZ`(Z&MRT9DX)`xXXDc1OY*<#g+<$dIhPqK(Qe;s7(M3Wya~N<5-5oe)#L{djLz=u`q^33-_>O;A;z6EE>3P z;2RSUEadU6T9!?$n3z)DRTJN-ea*x}wSRA*Y+)Gd1}YYQz@q|2P&Ke2Fc3t|ri=w9 zYEj&D+_vi-N{7a!Bd4ZaD-2roLqA;;$j;2}3gjx$z7)7p^Fz7WY3<2)$K4BPDb^y- z4R+nwSNf?jmmd0wz@6G&5P8Smq3egvFC7`ba-ONR8pV}EHwLfCDe&SMz!c@Lg1hqepwefg3iRM=w3uPW>okxxq&2ddGFQt(zsyB=UJDO#PPJ^%I{g zl*2GeT@_9ehBV1X9kS`1c5AMB!6~~|BkIJS?BSdEKX&e_Zfs0o(!gUIPcSKPy^q)P zWC+;({R`ac3-+S$z;AY94bCBb)C9&`N!uwaq7{zBIhL=IG>WA<^{I^?QDckeV)VTz z!V(*GJQXmu;^soVv29~hsX30;f{iUDk7z*uCDO*W>SVeP+{Y)xz%v`q(XcU&Yozqw zdRu!((n|$yUzp@|H}Sn*hpOL*lTkQpU)}CZ-}N@q*bkd4YS0UTpQM@wf#I3i3ln1` zGTn4rtYA{AC+#Qu965^Rg9AVCHL;wuHVdYDP26Pq$Uljr+URRT9j zR%So?NHN7HJ;vWcz*59e%2MW}aJ^2=;V!u6=T0DAQ^?>3*8y!D!cEF{F94t57BzuS znViwdf3Vm9Z5wZpd57$a6Xa^|kbhA$PGHvOyC`gG)uOtbo5<0yoG%qGbzzr^gI!!M z6|ZzL^c&1tsf*%k7U%DTGXJEkhH)Q*EPs{SHC!UzG4Tdw|C4ialNeeYd4sFJV^q;8`sf^{_7!azEc^{jz*_YH diff --git a/target/test-classes/blockchain/query/QueryTest.class b/target/test-classes/blockchain/query/QueryTest.class index 1c08942325d2dd1bb1983612a9da451ba9f4f8af..e62b557cdd04ea29b51bd689a54fda00e9fa5198 100644 GIT binary patch delta 149 zcmWNKI|{-;7zSsxQ!ud*l_);4iufXCeU;JP(lTW#I|UEmK>~Jm3VQ*2!E*?L7GA)g z4`zxfzEr3B7COqc#xW`>k)=W&j{-Hy)M?1NG%>V@XtTj*izcQ+B4tO9BYjQ`I5XtJ p2+No|0Z%5p2zfK-!;~*Gek|<6T`I3ghCK)mti?H$99&sN)j!*R7^naM delta 149 zcmWN~ze)lD0KnnzY)kOcK{*;+j)sb)&MdL~OWD%c*mzT0f)C(>9JsX=+zYr1K8GOW z;0t)mH~rw3#aaA!7Y5Zl36mhLI}s_nRB@%@TGNdSEs0yh!gp;S?tSV=J^0c!*R$|s s>DiCI+`!7n#@N=x&eXpbd#?`O^7Ywca9&gLP2sG_I29CwU!!4k1Xs8kIRF3v diff --git a/target/test-classes/blockchain/user/UserContextTest.class b/target/test-classes/blockchain/user/UserContextTest.class index f6e3c6a4a9600493ae003db52d433fdb1d864c7d..cfa4362943b4653153ff640e1d586b7dd1f1e60f 100644 GIT binary patch delta 51 zcmbQvF`Z*W5Hlmk#9+uE%wWkNGWjX9 F5dg|z2K4{{ delta 51 zcmbQvF`Z*W5HlnDfI)*nkin2ah{2LUc=A(b FBLK;H2I~L- diff --git a/target/test-classes/blockchain/utility/ReadUserTest.class b/target/test-classes/blockchain/utility/ReadUserTest.class index e29c3d74246216d94e90fd06d3df60a7d0287f4c..4e2f922ff5a81adbcb30ddf5703149a51cda10ae 100644 GIT binary patch delta 55 zcmeyu^@VFgISV7l23`gk20jLD27U%B1_1^a24Mzw20;c7po|ZL J$Yf1cZvZ5!2vGn4 diff --git a/target/test-classes/blockchain/utility/UtilEnrollTest.class b/target/test-classes/blockchain/utility/UtilEnrollTest.class deleted file mode 100644 index 12bd5ce2cccc6e663ab30b2dab343a0340dbe29a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1388 zcmZ`(VNcsu6g@8q*fB29P++B732nCmEqG(lZG_RKEU>nQN+d;^_Q{yn@W8Pn`(;{x z(LQ&R+G>;b1NM2pXWDrVtf8nN`Q3ZpdGDTce4W4l{o^kHt9a_5g8L4Zuw2Gfcs4$F z@C8;Zd}(3T#+rj+JTQ;1Y0su8rIVx>0)it`Hx0;R3wND7SkDwcb_&Y?_O!C}No#ZST@ItWr_^0Q(| zAFE8@wtpBU;c0jrsMzai6)FAFd(O2Hr%4pGWTx3^!mRZjsryygk+BxAyQkYpbYy6b z`X|B9fu|C0TSd}v;~pc@`RV;FCzPo^KWOJkjub>s_Q6pQx4p(Mq3mjv#JuiGQwQPc zZqUuy(=|G?-;1^C$ODxr%Bsh4q5}h`s`1>llOFBy&Lr3yVRUAf(@c74DEs^-E{a_? zI$TU*%EEUp>X>pdfoo*8Wd5qnR(-!!Z8e&$s>v-pa8Xc1ZD?p4U_nVYWLEd zowt=|0@IzW>(!4sDmFwi?^M3bbdpNbyy0RSJJk3dCNOa07&XqA{!7)JMyuM`+kfW! zjorpxpA}zN&gPNWBgD>3pGK2g&~H;Sqkf^@)TxTwdA%H|Oy_nAT%BLI zG2hmTNHjnu~K@Cp+7PFW5s@h zvVZS2oZUPfVY;`(biHI?E@8jIHh|Grys(HBtnv4yn73ZW2(KJxHo@o`xlXe66z;I) zA`vUpw1!zcKo#q(8j71FJc&>Ef0Osk5H-u)0(VD=zR9~5VdEBSC7vtcHg}Bb+L@?N u8CxjyEPPhNT_#5VJXaeF|64Ve9|6jhv9}oi9Ytf87_iG2wa8il_x=MlheA34 diff --git a/target/test-classes/blockchain/utility/UtilTest.class b/target/test-classes/blockchain/utility/UtilTest.class index 67dc2a15c8d18caca38462160ee8dfc692dde113..f95febe409e664c8c7848aad9d6e985c39e2fb00 100644 GIT binary patch delta 121 zcmew&@I_#Q02?FEWI?tvNkIl?24Mzn1`!}B${@}l#$d)E!C=QAHTfgE#pD}o!HV)g z6$(HVia-@g43Z4W4Dt*rK&Z-~#h}ih$DldchrLHq7pO`Ps7fEG$^dANAM Nb5a?3Cx>&$0svY}5vTwF delta 121 zcmew&@I_#Q02?FsWI?tvNdX3C1|bG+24Nr+VGw5!WiSJhb_|k}KeAg)zQGo(C