diff --git a/msp/org1/admin.context b/msp/org1/admin.context index 45ce6d3..b91b5d4 100644 Binary files a/msp/org1/admin.context and b/msp/org1/admin.context differ diff --git a/src/main/java/restService/WelcomeResource.java b/src/main/java/restService/WelcomeResource.java index 933e27e..0273b5a 100644 --- a/src/main/java/restService/WelcomeResource.java +++ b/src/main/java/restService/WelcomeResource.java @@ -1,11 +1,37 @@ package restService; +import blockchain.client.CAClientWrapper; +import blockchain.configuration.Config; +import blockchain.user.UserContext; +import org.hyperledger.fabric.sdk.Enrollment; +import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import static org.junit.Assert.assertEquals; + @RestController public class WelcomeResource { @RequestMapping("/") public String index(){return "Welcome from Monnethic !";} + @RequestMapping("/bc/register/admin") + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public void registerAdminApp(){ + String caUrl = Config.CA_ORG1_URL; + try { + CAClientWrapper caClientWrapper = new CAClientWrapper(caUrl,null); + UserContext adminContext = new UserContext(); + adminContext.setName(Config.ADMIN); + adminContext.setAffiliation(Config.ORG1); + adminContext.setMspId(Config.ORG1_MSP); + caClientWrapper.setAdminContext(adminContext); + caClientWrapper.enrollAdmin(adminContext.getName(),Config.ADMIN_PASSWORD,adminContext.getAffiliation()); + }catch (Exception e){ + e.printStackTrace(); + } + } + + } \ No newline at end of file diff --git a/src/test/java/restImplementation/WalletImplementationTest.java b/src/test/java/restImplementation/WalletImplementationTest.java index c0dc0e7..6b2b667 100644 --- a/src/test/java/restImplementation/WalletImplementationTest.java +++ b/src/test/java/restImplementation/WalletImplementationTest.java @@ -35,6 +35,8 @@ public class WalletImplementationTest { } */ + /* + @Test public void TestDeleteWallet() { //OK BasicConfigurator.configure(); @@ -82,15 +84,16 @@ public class WalletImplementationTest { logger.warn("Error: "+e.getMessage()); } } - + */ @Test public void TestGetUserWallet(){ //OK BasicConfigurator.configure(); WalletImplementation walletImplementation = new WalletImplementation(); try{ - walletImplementation.getAllUserWallets("$2a$10$EBoYmkW7mdss58LtrNvcg.Igtkx/Vyncnw3o0MA99SJi32UXyKgwe"); + walletImplementation.getAllUserWallets("$2a$10$r7jlPdeESPFd1dKjvrEmB.SoxOXh3jHtWiPTAFKB3lGSgvda.zMyC"); } catch (Exception e){ logger.warn("Error: "+e.getMessage()); } } + }