Merge branch 'features/apiFront' into develop
This commit is contained in:
commit
2d51032d0f
Binary file not shown.
|
@ -29,6 +29,7 @@ public class TransactionWrapper {
|
||||||
tpr.setArgs(new String[]{from,to,amount});
|
tpr.setArgs(new String[]{from,to,amount});
|
||||||
|
|
||||||
Collection<ProposalResponse> responses = channelClientWrapper.sendTransactionProposal(tpr);
|
Collection<ProposalResponse> responses = channelClientWrapper.sendTransactionProposal(tpr);
|
||||||
|
System.out.println("VERIFY HERE, TRY TO SEND TRANSACTION");
|
||||||
BlockEvent.TransactionEvent event = channelClientWrapper.sendTransaction(responses);
|
BlockEvent.TransactionEvent event = channelClientWrapper.sendTransaction(responses);
|
||||||
|
|
||||||
return event.getTransactionID();
|
return event.getTransactionID();
|
||||||
|
|
15
src/main/java/restImplementation/QueryImplementation.java
Normal file
15
src/main/java/restImplementation/QueryImplementation.java
Normal file
|
@ -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;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
28
src/main/java/restService/QueryController.java
Normal file
28
src/main/java/restService/QueryController.java
Normal file
|
@ -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);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -55,7 +55,7 @@ public class ChaincodeTransactionTest {
|
||||||
ChaincodeID cid = ChaincodeID.newBuilder().setName(Config.CHAINCODE_NAME).build();
|
ChaincodeID cid = ChaincodeID.newBuilder().setName(Config.CHAINCODE_NAME).build();
|
||||||
tpr.setChaincodeID(cid);
|
tpr.setChaincodeID(cid);
|
||||||
tpr.setFcn("invoke");
|
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<ProposalResponse> responses = channel.sendTransactionProposal(tpr);
|
Collection<ProposalResponse> responses = channel.sendTransactionProposal(tpr);
|
||||||
List<ProposalResponse> invalid = responses.stream().filter(r -> r.isInvalid()).collect(Collectors.toList());
|
List<ProposalResponse> 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();
|
BlockEvent.TransactionEvent event = channel.sendTransaction(responses).get();
|
||||||
logger.info("Event transaction id : "+event.getTransactionID()); //print transaction id
|
logger.info("Event transaction id : "+event.getTransactionID()); //print transaction id
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ public class TransactionWrapperTest {
|
||||||
BasicConfigurator.configure();
|
BasicConfigurator.configure();
|
||||||
QueryWrapper queryWrapper = new QueryWrapper();
|
QueryWrapper queryWrapper = new QueryWrapper();
|
||||||
TransactionWrapper transactionWrapper = new TransactionWrapper();
|
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);
|
logger.info("TRANSACTION ID : "+responseTransaction);
|
||||||
|
|
||||||
String responseUserB = queryWrapper.getUserBalance("b"); //check new balance of user b
|
String responseUserB = queryWrapper.getUserBalance("b"); //check new balance of user b
|
||||||
|
|
Binary file not shown.
|
@ -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
|
|
|
@ -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
|
|
|
@ -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
|
|
|
@ -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
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue