From 270fa6d692c688a9cd0ca9465a65b86e46524c9d Mon Sep 17 00:00:00 2001 From: GME Date: Sat, 17 Nov 2018 11:21:34 +0100 Subject: [PATCH] Clean code Delete old unused code and remove unused class --- msp/AdminFiles/admin/admin.context | Bin 1697 -> 0 bytes .../Admin@org1.example.com-cert.pem | 14 ------ ...65b858048111bc01cb46ac33c77fc94011f7b89_sk | 5 -- .../query/QueryForChannelsTest.java | 45 ------------------ .../blockchain/utility/UtilEnrollTest.java | 37 -------------- 5 files changed, 101 deletions(-) delete mode 100644 msp/AdminFiles/admin/admin.context delete mode 100644 msp/AdminFiles/admincerts/Admin@org1.example.com-cert.pem delete mode 100644 msp/AdminFiles/keystore/26ce2201d545355779a279f1565b858048111bc01cb46ac33c77fc94011f7b89_sk delete mode 100644 src/test/java/blockchain/query/QueryForChannelsTest.java delete mode 100644 src/test/java/blockchain/utility/UtilEnrollTest.java diff --git a/msp/AdminFiles/admin/admin.context b/msp/AdminFiles/admin/admin.context deleted file mode 100644 index 4e2b42eec80f7c1d93c6abada60613ec82570c41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1697 zcmb_cOQ_sb7(RFItBp#vr4+S`DpIv$Gc)PTee_|QlVmcvlgyn*X6DXRkW40%_au|Y zO>&V+U0AFOkz$1lVx=w=DuRfMF1pc$AT6lXO;KFvMy#8vsae*V{Y z&d2}#mu`Y-*8z|A3`^8SMNo&R?@A8Zj4#3(dQ#|tjWdw~Gc1@DMA7nxo(Fcany@Nl z3}Gl|8lIyLXc~L-PB(zi{@GZ32i{bCbPpcPFAjN_yQF6RZs7YOlJg{d2$dyFjQN1Wr zmZGYlIx(P^`sQGAAVo8keFRnKnIc2rJT>+r9K*mljUezYE#mF_MG?(KS7;X$u3if$xkI*UwK75l9wV(lLo`F9OZN>?qpBR99XBLGj;@@>R_SWZ5Og!Egz8hCQ{H+x^&L&X|T&dj)u{QZgBZUT&8G(*su{i zph|d_!675*X&4CwZoX|86|x|%*5w8x^Ey#l9$`_in761v^Q(Rs8cjdFNEBF4Cj=~2SC*@ij!aCjY@~w1k{t&_Dbd0d`bEXyw7uGVTKE>}u82`OBKOfJVakvZ3GE%mC( zpvz7+KIyavk$c&8hm^0618v1-iSt(#zcF=Y6dW0c;SmKMk zwV-PnQ>^!!!v*meG9FT@LjHYlV*%|>#EssWd31B;-<-Vv@K;xNo*OF#u^n|)@T55A zfk*BUN%d|l*7A1S?-{B%PJH;@#5T5*)}#NCuXOj zY>=9mnA-Q@%@1_kX^Bdv5*g?t@DoAD=w+3S?j0djZ)hdWW2ZVCu}f zxA(69cM1M+sLC`pNxJOv}k^=N~Eg WU;gHS*<^upjj9Kxg}$i{?LPrOtvA8| diff --git a/msp/AdminFiles/admincerts/Admin@org1.example.com-cert.pem b/msp/AdminFiles/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index 574766b..0000000 --- a/msp/AdminFiles/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGjCCAcCgAwIBAgIRAI78GIwc1BJbESAVBAu12zgwCgYIKoZIzj0EAwIwczEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMTE2Nh -Lm9yZzEuZXhhbXBsZS5jb20wHhcNMTgwMjExMTQxODI4WhcNMjgwMjA5MTQxODI4 -WjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN -U2FuIEZyYW5jaXNjbzEfMB0GA1UEAwwWQWRtaW5Ab3JnMS5leGFtcGxlLmNvbTBZ -MBMGByqGSM49AgEGCCqGSM49AwEHA0IABHc7mBPjvRt41DHUQOwBmPdosuyBiR5q -9ODr4IRm0nSPy8qNMOwNzjq+FBlD/h5q36rHwGVmyK31BlIX3SN6u8KjTTBLMA4G -A1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIMsE632KJqem -rpj0tWcvTaIXe5aa0DPs8dxIkaPosSv8MAoGCCqGSM49BAMCA0gAMEUCIQDxrPnJ -H6UDSPyTAkIZ156RRuAXm3S3quTrXYAVEP1bNgIgNmaykOaIbTBTw7LSv8zPZopP -5XHsa6MEFFL0KM6whQk= ------END CERTIFICATE----- diff --git a/msp/AdminFiles/keystore/26ce2201d545355779a279f1565b858048111bc01cb46ac33c77fc94011f7b89_sk b/msp/AdminFiles/keystore/26ce2201d545355779a279f1565b858048111bc01cb46ac33c77fc94011f7b89_sk deleted file mode 100644 index 8151aca..0000000 --- a/msp/AdminFiles/keystore/26ce2201d545355779a279f1565b858048111bc01cb46ac33c77fc94011f7b89_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg2KnGkVeiwErPZq2n -WX0AjHkS+XOx2sqON1n4kiTw5QuhRANCAAR3O5gT470beNQx1EDsAZj3aLLsgYke -avTg6+CEZtJ0j8vKjTDsDc46vhQZQ/4eat+qx8BlZsit9QZSF90jervC ------END PRIVATE KEY----- diff --git a/src/test/java/blockchain/query/QueryForChannelsTest.java b/src/test/java/blockchain/query/QueryForChannelsTest.java deleted file mode 100644 index e98709a..0000000 --- a/src/test/java/blockchain/query/QueryForChannelsTest.java +++ /dev/null @@ -1,45 +0,0 @@ -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.Enrollment; -import org.hyperledger.fabric.sdk.Peer; -import org.junit.Test; - -import java.io.File; -import java.util.Set; - -public class QueryForChannelsTest { - private static Logger logger = Logger.getLogger(QueryForChannelsTest.class); - @Test - public void TestAQueryPeerChannels(){ - BasicConfigurator.configure(); - - try{ - //TEST - 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 - - //FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(admin); - //Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL); - //Set channels = fabricClientWrapper.getClient().queryChannels(peer); - //logger.info(channels); - - }catch(Exception e){ - e.printStackTrace(); - } - } -} diff --git a/src/test/java/blockchain/utility/UtilEnrollTest.java b/src/test/java/blockchain/utility/UtilEnrollTest.java deleted file mode 100644 index 5954fc0..0000000 --- a/src/test/java/blockchain/utility/UtilEnrollTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package blockchain.utility; - -import blockchain.configuration.Config; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Logger; -import org.hyperledger.fabric.sdk.Enrollment; -import org.junit.Test; - -import java.io.File; - -public class UtilEnrollTest { - private static Logger logger = Logger.getLogger(UtilTest.class); - - @Test - public void TestAGetEnrollement(){ - BasicConfigurator.configure(); - - try{ - logger.info("----- START TEST ----"); - File pkFolder = new File(Config.ADMIN_KEY_PATH); - File[] pkFile = pkFolder.listFiles(); - File certFolder = new File(Config.ADMIN_CERT_PATH); - File[] certFile = certFolder.listFiles(); - logger.info("----- GET ENROLLEMENT ----"); - //Enrollment enrollAdmin = Util.getEnrollement(Config.ADMIN_KEY_PATH, pkFile[0].getName(), Config.ADMIN_CERT_PATH, certFile[0].getName()); - - //logger.info("KEY : "+enrollAdmin.getKey()); - //logger.info("CERT : "+enrollAdmin.getCert()); - - - }catch (Exception e){ - e.printStackTrace(); - } - - - } -}