diff --git a/cmd.txt b/cmd.txt new file mode 100644 index 0000000..16e42cd --- /dev/null +++ b/cmd.txt @@ -0,0 +1 @@ +mvn package && java -jar target/java-api-0.1.jar \ No newline at end of file diff --git a/msp/toto/abdel.context b/msp/toto/abdel.context deleted file mode 100644 index 95e9850..0000000 Binary files a/msp/toto/abdel.context and /dev/null differ diff --git a/src/main/java/blockchain/query/TransactionWrapper.java b/src/main/java/blockchain/query/TransactionWrapper.java index f1b62eb..65c562b 100644 --- a/src/main/java/blockchain/query/TransactionWrapper.java +++ b/src/main/java/blockchain/query/TransactionWrapper.java @@ -29,6 +29,7 @@ public class TransactionWrapper { tpr.setArgs(new String[]{from,to,amount}); Collection responses = channelClientWrapper.sendTransactionProposal(tpr); + System.out.println("VERIFY HERE, TRY TO SEND TRANSACTION"); BlockEvent.TransactionEvent event = channelClientWrapper.sendTransaction(responses); return event.getTransactionID(); diff --git a/src/main/java/restImplementation/QueryImplementation.java b/src/main/java/restImplementation/QueryImplementation.java new file mode 100644 index 0000000..3699540 --- /dev/null +++ b/src/main/java/restImplementation/QueryImplementation.java @@ -0,0 +1,15 @@ +package restImplementation; + +import blockchain.query.QueryWrapper; + +public class QueryImplementation { + + public String getUserBalance(String userHash){ + QueryWrapper queryWrapper = new QueryWrapper(); + + String result = queryWrapper.getUserBalance(userHash); + //do something here ? + return result; + + } +} diff --git a/src/main/java/restService/QueryController.java b/src/main/java/restService/QueryController.java new file mode 100644 index 0000000..8debecf --- /dev/null +++ b/src/main/java/restService/QueryController.java @@ -0,0 +1,28 @@ +package restService; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; +import restImplementation.QueryImplementation; + +@RestController +public class QueryController { + + @RequestMapping(value = "/user",params = {"name"}) + public @ResponseBody + String getUser( + @RequestParam(value = "name") String hash){ + return "Hello "+hash; + } + + @RequestMapping(value = "/balance",params = {"name"}) + public @ResponseBody + String getUserBalance( + @RequestParam(value = "name") String hash){ + QueryImplementation queryImplementation = new QueryImplementation(); + return queryImplementation.getUserBalance(hash); + } + + +} diff --git a/src/test/java/blockchain/query/ChaincodeTransactionTest.java b/src/test/java/blockchain/query/ChaincodeTransactionTest.java index 53deae1..3b109ea 100644 --- a/src/test/java/blockchain/query/ChaincodeTransactionTest.java +++ b/src/test/java/blockchain/query/ChaincodeTransactionTest.java @@ -55,7 +55,7 @@ public class ChaincodeTransactionTest { ChaincodeID cid = ChaincodeID.newBuilder().setName(Config.CHAINCODE_NAME).build(); tpr.setChaincodeID(cid); tpr.setFcn("invoke"); - tpr.setArgs(new String[]{"a","b","20"}); //send 20 from a to b + tpr.setArgs(new String[]{"b","a","25"}); //send 20 from a to b Collection responses = channel.sendTransactionProposal(tpr); List invalid = responses.stream().filter(r -> r.isInvalid()).collect(Collectors.toList()); @@ -67,6 +67,7 @@ public class ChaincodeTransactionTest { } + logger.info("SEND TRANSACTION"); BlockEvent.TransactionEvent event = channel.sendTransaction(responses).get(); logger.info("Event transaction id : "+event.getTransactionID()); //print transaction id diff --git a/src/test/java/blockchain/queryWrapper/TransactionWrapperTest.java b/src/test/java/blockchain/queryWrapper/TransactionWrapperTest.java index 2a1d63f..aa54215 100644 --- a/src/test/java/blockchain/queryWrapper/TransactionWrapperTest.java +++ b/src/test/java/blockchain/queryWrapper/TransactionWrapperTest.java @@ -16,7 +16,7 @@ public class TransactionWrapperTest { BasicConfigurator.configure(); QueryWrapper queryWrapper = new QueryWrapper(); TransactionWrapper transactionWrapper = new TransactionWrapper(); - String responseTransaction = transactionWrapper.sendTransaction("a","b","15"); //do transaction + String responseTransaction = transactionWrapper.sendTransaction("b","a","150"); //do transaction logger.info("TRANSACTION ID : "+responseTransaction); String responseUserB = queryWrapper.getUserBalance("b"); //check new balance of user b diff --git a/target/classes/restService/WelcomeController.class b/target/classes/restService/WelcomeController.class deleted file mode 100644 index d8eabe7..0000000 Binary files a/target/classes/restService/WelcomeController.class and /dev/null differ diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index df7824d..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,11 +0,0 @@ -restService\WelcomeController.class -blockchain\user\UserContext.class -blockchain\client\CAClientWrapper.class -blockchain\utility\Util.class -blockchain\client\ChannelClientWrapper.class -blockchain\user\CAEnrollement.class -Application\App.class -blockchain\configuration\Config.class -blockchain\query\QueryWrapper.class -blockchain\query\TransactionWrapper.class -blockchain\client\FabricClientWrapper.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 34b86a6..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,11 +0,0 @@ -B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\client\ChannelClientWrapper.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\client\FabricClientWrapper.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\user\CAEnrollement.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\client\CAClientWrapper.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\query\QueryWrapper.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\restService\WelcomeController.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\Application\App.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\configuration\Config.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\query\TransactionWrapper.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\user\UserContext.java -B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\utility\Util.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index 221c910..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1,11 +0,0 @@ -blockchain\query\QueryTest.class -blockchain\queryWrapper\QueryWrapperTest.class -blockchain\query\QueryChannelTest.class -blockchain\queryWrapper\TransactionWrapperTest.class -blockchain\utility\UtilTest.class -blockchain\client\TestEnrollAdmin.class -blockchain\query\ChaincodeTransactionTest.class -blockchain\utility\ReadUserTest.class -blockchain\client\TestRegisterEnrollUser.class -blockchain\query\CreateChaincodeUserTest.class -blockchain\user\UserContextTest.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index 91dce2d..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1,11 +0,0 @@ -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\client\TestRegisterEnrollUser.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\QueryTest.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\client\TestEnrollAdmin.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\CreateChaincodeUserTest.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\queryWrapper\TransactionWrapperTest.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\utility\UtilTest.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\QueryChannelTest.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\ChaincodeTransactionTest.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\utility\ReadUserTest.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\queryWrapper\QueryWrapperTest.java -B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\user\UserContextTest.java diff --git a/target/surefire/surefirebooter2244873732484001783.jar b/target/surefire/surefirebooter2244873732484001783.jar deleted file mode 100644 index 2c9c94d..0000000 Binary files a/target/surefire/surefirebooter2244873732484001783.jar and /dev/null differ diff --git a/target/test-classes/blockchain/client/TestEnrollAdmin.class b/target/test-classes/blockchain/client/TestEnrollAdmin.class deleted file mode 100644 index e323018..0000000 Binary files a/target/test-classes/blockchain/client/TestEnrollAdmin.class and /dev/null differ diff --git a/target/test-classes/blockchain/client/TestRegisterEnrollUser.class b/target/test-classes/blockchain/client/TestRegisterEnrollUser.class deleted file mode 100644 index d05214f..0000000 Binary files a/target/test-classes/blockchain/client/TestRegisterEnrollUser.class and /dev/null differ diff --git a/target/test-classes/blockchain/query/ChaincodeTransactionTest.class b/target/test-classes/blockchain/query/ChaincodeTransactionTest.class deleted file mode 100644 index 584e906..0000000 Binary files a/target/test-classes/blockchain/query/ChaincodeTransactionTest.class and /dev/null differ diff --git a/target/test-classes/blockchain/query/CreateChaincodeUserTest.class b/target/test-classes/blockchain/query/CreateChaincodeUserTest.class deleted file mode 100644 index d18a495..0000000 Binary files a/target/test-classes/blockchain/query/CreateChaincodeUserTest.class and /dev/null differ diff --git a/target/test-classes/blockchain/query/QueryChannelTest.class b/target/test-classes/blockchain/query/QueryChannelTest.class deleted file mode 100644 index c92b0e8..0000000 Binary files a/target/test-classes/blockchain/query/QueryChannelTest.class and /dev/null differ diff --git a/target/test-classes/blockchain/query/QueryTest.class b/target/test-classes/blockchain/query/QueryTest.class deleted file mode 100644 index 35fa21a..0000000 Binary files a/target/test-classes/blockchain/query/QueryTest.class and /dev/null differ diff --git a/target/test-classes/blockchain/queryWrapper/QueryWrapperTest.class b/target/test-classes/blockchain/queryWrapper/QueryWrapperTest.class deleted file mode 100644 index 9e060b4..0000000 Binary files a/target/test-classes/blockchain/queryWrapper/QueryWrapperTest.class and /dev/null differ diff --git a/target/test-classes/blockchain/queryWrapper/TransactionWrapperTest.class b/target/test-classes/blockchain/queryWrapper/TransactionWrapperTest.class deleted file mode 100644 index ca8a34f..0000000 Binary files a/target/test-classes/blockchain/queryWrapper/TransactionWrapperTest.class and /dev/null differ diff --git a/target/test-classes/blockchain/user/UserContextTest.class b/target/test-classes/blockchain/user/UserContextTest.class deleted file mode 100644 index cfa4362..0000000 Binary files a/target/test-classes/blockchain/user/UserContextTest.class and /dev/null differ diff --git a/target/test-classes/blockchain/utility/ReadUserTest.class b/target/test-classes/blockchain/utility/ReadUserTest.class deleted file mode 100644 index 4e2f922..0000000 Binary files a/target/test-classes/blockchain/utility/ReadUserTest.class and /dev/null differ diff --git a/target/test-classes/blockchain/utility/UtilTest.class b/target/test-classes/blockchain/utility/UtilTest.class deleted file mode 100644 index f95febe..0000000 Binary files a/target/test-classes/blockchain/utility/UtilTest.class and /dev/null differ