diff --git a/src/main/java/Application/App.java b/src/main/java/Application/App.java new file mode 100644 index 0000000..9ebf319 --- /dev/null +++ b/src/main/java/Application/App.java @@ -0,0 +1,7 @@ +package Application; + +public class App { + public static void main(String [ ] args){ + System.out.println("Welcome"); + } +} diff --git a/src/main/java/blockchain/utility/Util.java b/src/main/java/blockchain/utility/Util.java index 621e99f..82db643 100644 --- a/src/main/java/blockchain/utility/Util.java +++ b/src/main/java/blockchain/utility/Util.java @@ -97,6 +97,7 @@ 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; @@ -131,4 +132,5 @@ public class Util { CAEnrollement enrollment = new CAEnrollement(key,certificate); return enrollment; } + */ } diff --git a/src/test/java/blockchain/query/QueryForChannelsTest.java b/src/test/java/blockchain/query/QueryForChannelsTest.java new file mode 100644 index 0000000..e98709a --- /dev/null +++ b/src/test/java/blockchain/query/QueryForChannelsTest.java @@ -0,0 +1,45 @@ +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/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java index da92875..ad83de3 100644 --- a/src/test/java/blockchain/query/QueryTest.java +++ b/src/test/java/blockchain/query/QueryTest.java @@ -21,8 +21,8 @@ public class QueryTest { 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{ diff --git a/src/test/java/blockchain/utility/UtilEnrollTest.java b/src/test/java/blockchain/utility/UtilEnrollTest.java index 63d812b..5954fc0 100644 --- a/src/test/java/blockchain/utility/UtilEnrollTest.java +++ b/src/test/java/blockchain/utility/UtilEnrollTest.java @@ -22,10 +22,10 @@ public class UtilEnrollTest { 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()); + //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()); + //logger.info("KEY : "+enrollAdmin.getKey()); + //logger.info("CERT : "+enrollAdmin.getCert()); }catch (Exception e){ diff --git a/target/classes/Application/App.class b/target/classes/Application/App.class new file mode 100644 index 0000000..1c1ad9e Binary files /dev/null and b/target/classes/Application/App.class differ diff --git a/target/classes/blockchain/utility/Util.class b/target/classes/blockchain/utility/Util.class index b986232..fe93204 100644 Binary files a/target/classes/blockchain/utility/Util.class and b/target/classes/blockchain/utility/Util.class differ diff --git a/target/test-classes/blockchain/query/ChaincodeTransactionTest.class b/target/test-classes/blockchain/query/ChaincodeTransactionTest.class index 3d75b9c..deb57c0 100644 Binary files a/target/test-classes/blockchain/query/ChaincodeTransactionTest.class and b/target/test-classes/blockchain/query/ChaincodeTransactionTest.class differ diff --git a/target/test-classes/blockchain/query/QueryForChannelsTest.class b/target/test-classes/blockchain/query/QueryForChannelsTest.class new file mode 100644 index 0000000..d9e78fe Binary files /dev/null and b/target/test-classes/blockchain/query/QueryForChannelsTest.class differ diff --git a/target/test-classes/blockchain/query/QueryTest.class b/target/test-classes/blockchain/query/QueryTest.class index f0e4fdd..bb3dde5 100644 Binary files a/target/test-classes/blockchain/query/QueryTest.class and b/target/test-classes/blockchain/query/QueryTest.class differ diff --git a/target/test-classes/blockchain/utility/UtilEnrollTest.class b/target/test-classes/blockchain/utility/UtilEnrollTest.class index d94a6a3..12bd5ce 100644 Binary files a/target/test-classes/blockchain/utility/UtilEnrollTest.class and b/target/test-classes/blockchain/utility/UtilEnrollTest.class differ