diff --git a/msp/AdminFiles/admin/admin.context b/msp/AdminFiles/admin/admin.context deleted file mode 100644 index 4e2b42e..0000000 Binary files a/msp/AdminFiles/admin/admin.context and /dev/null differ 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(); - } - - - } -}