diff --git a/src/main/java/cn/hyperchain/sdk/request/BlockRequest.java b/src/main/java/cn/hyperchain/sdk/request/BlockRequest.java index e0570618..23a99faa 100644 --- a/src/main/java/cn/hyperchain/sdk/request/BlockRequest.java +++ b/src/main/java/cn/hyperchain/sdk/request/BlockRequest.java @@ -1,17 +1,9 @@ package cn.hyperchain.sdk.request; -import cn.hyperchain.sdk.exception.RequestException; import cn.hyperchain.sdk.provider.ProviderManager; -import cn.hyperchain.sdk.response.BlockResponse; -public class BlockRequest extends Request { - - public BlockRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) { +public class BlockRequest extends Request { + public BlockRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) { super(method, providerManager, clazz, nodeIds); } - - @Override - public T send() throws RequestException { - return super.send(); - } } diff --git a/src/main/java/cn/hyperchain/sdk/request/MQRequest.java b/src/main/java/cn/hyperchain/sdk/request/MQRequest.java index bb93b111..306eef9e 100644 --- a/src/main/java/cn/hyperchain/sdk/request/MQRequest.java +++ b/src/main/java/cn/hyperchain/sdk/request/MQRequest.java @@ -1,19 +1,9 @@ package cn.hyperchain.sdk.request; -import cn.hyperchain.sdk.exception.RequestException; import cn.hyperchain.sdk.provider.ProviderManager; -import cn.hyperchain.sdk.response.MQResponse; -import cn.hyperchain.sdk.response.Response; -public class MQRequest extends Request { +public class MQRequest extends Request { public MQRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) { super(method, providerManager, clazz, nodeIds); } - - @Override - public T send() throws RequestException { - T response = super.send(); - - return response; - } } diff --git a/src/main/java/cn/hyperchain/sdk/request/NodeRequest.java b/src/main/java/cn/hyperchain/sdk/request/NodeRequest.java index ef4f25e2..f466b7f9 100644 --- a/src/main/java/cn/hyperchain/sdk/request/NodeRequest.java +++ b/src/main/java/cn/hyperchain/sdk/request/NodeRequest.java @@ -1,9 +1,8 @@ package cn.hyperchain.sdk.request; import cn.hyperchain.sdk.provider.ProviderManager; -import cn.hyperchain.sdk.response.NodeResponse; -public class NodeRequest extends Request { +public class NodeRequest extends Request { public NodeRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) { super(method, providerManager, clazz, nodeIds); diff --git a/src/main/java/cn/hyperchain/sdk/request/RadarRequest.java b/src/main/java/cn/hyperchain/sdk/request/RadarRequest.java index 9d80a024..8f789b1d 100644 --- a/src/main/java/cn/hyperchain/sdk/request/RadarRequest.java +++ b/src/main/java/cn/hyperchain/sdk/request/RadarRequest.java @@ -1,17 +1,10 @@ package cn.hyperchain.sdk.request; -import cn.hyperchain.sdk.exception.RequestException; import cn.hyperchain.sdk.provider.ProviderManager; -import cn.hyperchain.sdk.response.Response; -public class RadarRequest extends Request { +public class RadarRequest extends Request { public RadarRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) { super(method, providerManager, clazz, nodeIds); } - - @Override - public Response send() throws RequestException { - return super.send(); - } } diff --git a/src/main/java/cn/hyperchain/sdk/request/TxRequest.java b/src/main/java/cn/hyperchain/sdk/request/TxRequest.java index ff7d7e27..1a2aef1b 100644 --- a/src/main/java/cn/hyperchain/sdk/request/TxRequest.java +++ b/src/main/java/cn/hyperchain/sdk/request/TxRequest.java @@ -2,7 +2,7 @@ import cn.hyperchain.sdk.exception.RequestException; import cn.hyperchain.sdk.provider.ProviderManager; -import cn.hyperchain.sdk.response.TxResponse; +import cn.hyperchain.sdk.response.tx.TxResponse; public class TxRequest extends Request { public TxRequest(String method, ProviderManager providerManager, Class clazz, int... nodeIds) { diff --git a/src/main/java/cn/hyperchain/sdk/response/block/BlockAvgTimeResponse.java b/src/main/java/cn/hyperchain/sdk/response/block/BlockAvgTimeResponse.java new file mode 100644 index 00000000..6c9a77f6 --- /dev/null +++ b/src/main/java/cn/hyperchain/sdk/response/block/BlockAvgTimeResponse.java @@ -0,0 +1,30 @@ +package cn.hyperchain.sdk.response.block; + +import cn.hyperchain.sdk.response.Response; +import com.google.gson.annotations.Expose; + +/** + * this class represents block average generate time response. + * + * @author dong + * @date 07/05/2019 + */ +public class BlockAvgTimeResponse extends Response { + @Expose + private String result; + + public String getResult() { + return result; + } + + @Override + public String toString() { + return "BlockAvgTimeResponse{" + + "result=" + result + + ", jsonrpc='" + jsonrpc + '\'' + + ", id='" + id + '\'' + + ", code=" + code + + ", message='" + message + '\'' + + '}'; + } +} diff --git a/src/main/java/cn/hyperchain/sdk/response/block/BlockCountResponse.java b/src/main/java/cn/hyperchain/sdk/response/block/BlockCountResponse.java new file mode 100644 index 00000000..43c94085 --- /dev/null +++ b/src/main/java/cn/hyperchain/sdk/response/block/BlockCountResponse.java @@ -0,0 +1,48 @@ +package cn.hyperchain.sdk.response.block; + +import cn.hyperchain.sdk.response.Response; +import com.google.gson.annotations.Expose; + +/** + * this class represents block count response. + * + * @author dong + * @date 07/05/2019 + */ +public class BlockCountResponse extends Response { + private class BlockCount { + @Expose + private String sumOfBlocks; + @Expose + private String startBlock; + @Expose + private String endBlock; + + @Override + public String toString() { + return "BlockCount{" + + "sumOfBlocks='" + sumOfBlocks + '\'' + + ", startBlock='" + startBlock + '\'' + + ", endBlock='" + endBlock + '\'' + + '}'; + } + } + + @Expose + private BlockCount result; + + public BlockCount getResult() { + return result; + } + + @Override + public String toString() { + return "BlockCountResponse{" + + "result=" + result + + ", jsonrpc='" + jsonrpc + '\'' + + ", id='" + id + '\'' + + ", code=" + code + + ", message='" + message + '\'' + + '}'; + } +} diff --git a/src/main/java/cn/hyperchain/sdk/response/block/BlockNumberResponse.java b/src/main/java/cn/hyperchain/sdk/response/block/BlockNumberResponse.java new file mode 100644 index 00000000..debc2241 --- /dev/null +++ b/src/main/java/cn/hyperchain/sdk/response/block/BlockNumberResponse.java @@ -0,0 +1,30 @@ +package cn.hyperchain.sdk.response.block; + +import cn.hyperchain.sdk.response.Response; +import com.google.gson.annotations.Expose; + +/** + * this class represents block number response. + * + * @author dong + * @date 07/05/2019 + */ +public class BlockNumberResponse extends Response { + @Expose + private String result; + + public String getResult() { + return result; + } + + @Override + public String toString() { + return "BlockNumberResponse{" + + "result=" + result + + ", jsonrpc='" + jsonrpc + '\'' + + ", id='" + id + '\'' + + ", code=" + code + + ", message='" + message + '\'' + + '}'; + } +} diff --git a/src/main/java/cn/hyperchain/sdk/response/BlockResponse.java b/src/main/java/cn/hyperchain/sdk/response/block/BlockResponse.java similarity index 76% rename from src/main/java/cn/hyperchain/sdk/response/BlockResponse.java rename to src/main/java/cn/hyperchain/sdk/response/block/BlockResponse.java index c5d94b44..a99a1d17 100644 --- a/src/main/java/cn/hyperchain/sdk/response/BlockResponse.java +++ b/src/main/java/cn/hyperchain/sdk/response/block/BlockResponse.java @@ -1,5 +1,7 @@ -package cn.hyperchain.sdk.response; +package cn.hyperchain.sdk.response.block; +import cn.hyperchain.sdk.response.Response; +import cn.hyperchain.sdk.response.tx.TxResponse; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -69,30 +71,12 @@ public String toString() { } } - private class BlockCount { - @Expose - private String sumOfBlocks; - @Expose - private String startBlock; - @Expose - private String endBlock; - - @Override - public String toString() { - return "BlockCount{" + - "sumOfBlocks='" + sumOfBlocks + '\'' + - ", startBlock='" + startBlock + '\'' + - ", endBlock='" + endBlock + '\'' + - '}'; - } - } - /** * get block list. * * @return block list */ - public List getBlocks() { + public List getResult() { ArrayList blocks = new ArrayList<>(); if (result.isJsonArray()) { JsonArray jsonArray = result.getAsJsonArray(); @@ -106,18 +90,6 @@ public List getBlocks() { return blocks; } - public String getAvgGenerateTime() { - return result.getAsString(); - } - - public String getBlockNumber() { - return result.getAsString(); - } - - public BlockCount getBlocksCount() { - return gson.fromJson(result, BlockCount.class); - } - @Override public String toString() { return "BlockResponse{" + diff --git a/src/main/java/cn/hyperchain/sdk/response/MQResponse.java b/src/main/java/cn/hyperchain/sdk/response/mq/MQResponse.java similarity index 89% rename from src/main/java/cn/hyperchain/sdk/response/MQResponse.java rename to src/main/java/cn/hyperchain/sdk/response/mq/MQResponse.java index 49e29c0e..3f8a4997 100644 --- a/src/main/java/cn/hyperchain/sdk/response/MQResponse.java +++ b/src/main/java/cn/hyperchain/sdk/response/mq/MQResponse.java @@ -1,5 +1,6 @@ -package cn.hyperchain.sdk.response; +package cn.hyperchain.sdk.response.mq; +import cn.hyperchain.sdk.response.Response; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -14,6 +15,7 @@ public class MQResponse extends Response { /** * return list of queue names. + * * @return list of queue names */ public List getQueueNames() { @@ -21,7 +23,7 @@ public List getQueueNames() { Gson gson = new Gson(); if (result.isJsonArray()) { JsonArray jsonArray = result.getAsJsonArray(); - for (JsonElement element: jsonArray) { + for (JsonElement element : jsonArray) { String name = gson.fromJson(element, String.class); queue.add(name); } diff --git a/src/main/java/cn/hyperchain/sdk/response/NodeResponse.java b/src/main/java/cn/hyperchain/sdk/response/node/NodeResponse.java similarity index 88% rename from src/main/java/cn/hyperchain/sdk/response/NodeResponse.java rename to src/main/java/cn/hyperchain/sdk/response/node/NodeResponse.java index 7c528ef2..e929fa2a 100644 --- a/src/main/java/cn/hyperchain/sdk/response/NodeResponse.java +++ b/src/main/java/cn/hyperchain/sdk/response/node/NodeResponse.java @@ -1,5 +1,6 @@ -package cn.hyperchain.sdk.response; +package cn.hyperchain.sdk.response.node; +import cn.hyperchain.sdk.response.Response; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -56,7 +57,7 @@ public String toString() { * get nodes info. * @return node info array */ - public List getNodes() { + public List getResult() { List nodes = new ArrayList<>(); Gson gson = new Gson(); if (result.isJsonArray()) { @@ -64,6 +65,9 @@ public List getNodes() { for (JsonElement jsonElement : jsonArray) { nodes.add(gson.fromJson(jsonElement, Node.class)); } + } else { + Node node = gson.fromJson(result, Node.class); + nodes.add(node); } return nodes; } diff --git a/src/main/java/cn/hyperchain/sdk/response/RadarResponse.java b/src/main/java/cn/hyperchain/sdk/response/radar/RadarResponse.java similarity index 77% rename from src/main/java/cn/hyperchain/sdk/response/RadarResponse.java rename to src/main/java/cn/hyperchain/sdk/response/radar/RadarResponse.java index 0df83c5c..b1350fd5 100644 --- a/src/main/java/cn/hyperchain/sdk/response/RadarResponse.java +++ b/src/main/java/cn/hyperchain/sdk/response/radar/RadarResponse.java @@ -1,4 +1,6 @@ -package cn.hyperchain.sdk.response; +package cn.hyperchain.sdk.response.radar; + +import cn.hyperchain.sdk.response.Response; public class RadarResponse extends Response { diff --git a/src/main/java/cn/hyperchain/sdk/response/TxResponse.java b/src/main/java/cn/hyperchain/sdk/response/tx/TxResponse.java similarity index 97% rename from src/main/java/cn/hyperchain/sdk/response/TxResponse.java rename to src/main/java/cn/hyperchain/sdk/response/tx/TxResponse.java index 1415636b..32329de4 100644 --- a/src/main/java/cn/hyperchain/sdk/response/TxResponse.java +++ b/src/main/java/cn/hyperchain/sdk/response/tx/TxResponse.java @@ -1,5 +1,6 @@ -package cn.hyperchain.sdk.response; +package cn.hyperchain.sdk.response.tx; +import cn.hyperchain.sdk.response.Response; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/src/main/java/cn/hyperchain/sdk/service/BlockService.java b/src/main/java/cn/hyperchain/sdk/service/BlockService.java index 944940bd..7b5b816b 100644 --- a/src/main/java/cn/hyperchain/sdk/service/BlockService.java +++ b/src/main/java/cn/hyperchain/sdk/service/BlockService.java @@ -1,7 +1,10 @@ package cn.hyperchain.sdk.service; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.BlockResponse; +import cn.hyperchain.sdk.response.block.BlockAvgTimeResponse; +import cn.hyperchain.sdk.response.block.BlockCountResponse; +import cn.hyperchain.sdk.response.block.BlockNumberResponse; +import cn.hyperchain.sdk.response.block.BlockResponse; import java.math.BigInteger; import java.util.ArrayList; @@ -9,54 +12,167 @@ /** * block service interface. * - * @author dong - * @date 07/04/2019 + * @author Jianhui Dong + * @date 2019-07-05 */ public interface BlockService { + /** + * get latest block. + * + * @param nodeIds specific ids + * @return {@link Request} of {@link BlockResponse} + */ Request getLatestBlock(int... nodeIds); + /** + * @see BlockService#getBlocks(String, String, boolean, int...) + */ Request getBlocks(BigInteger from, BigInteger to, int... nodeIds); + /** + * @see BlockService#getBlocks(String, String, boolean, int...) + */ Request getBlocks(String from, String to, int... nodeIds); + /** + * @see BlockService#getBlocks(String, String, boolean, int...) + */ Request getBlocks(BigInteger from, BigInteger to, boolean isPlain, int... nodeIds); + /** + * query the block of the specified block interval. + * + * @param from start block number + * @param to end block number + * @param isPlain default false, indicating that the returned block includes transaction information within the block. + * If specified, the returned block does not include transactions within the block + * @param nodeIds specific ids + * @return {@link Request} of {@link BlockResponse} + */ Request getBlocks(String from, String to, boolean isPlain, int... nodeIds); + /** + * @see BlockService#getBlockByHash(String, boolean, int...) + */ Request getBlockByHash(String blockHash, int... nodeIds); + /** + * get block by hash. + * + * @param blockHash block hash + * @param isPlain default false, indicating that the returned block includes transaction information within the block. + * If specified, the returned block does not include transactions within the block + * @param nodeIds specific ids + * @return {@link Request} of {@link BlockResponse} + */ Request getBlockByHash(String blockHash, boolean isPlain, int... nodeIds); + /** + * @see BlockService#getBatchBlocksByHash(ArrayList, boolean, int...) + */ Request getBatchBlocksByHash(ArrayList blockHashList, int... nodeIds); + /** + * get batch blocks based on hash list. + * + * @param blockHashList block hash list + * @param isPlain default false, indicating that the returned block includes transaction information within the block. + * If specified, the returned block does not include transactions within the block + * @param nodeIds specific ids + * @return {@link Request} of {@link BlockResponse} + */ Request getBatchBlocksByHash(ArrayList blockHashList, boolean isPlain, int... nodeIds); + /** + * @see BlockService#getBlockByNum(String, boolean, int...) + */ Request getBlockByNum(BigInteger blockNumber, int... nodeIds); + /** + * @see BlockService#getBlockByNum(String, boolean, int...) + */ Request getBlockByNum(String blockNumber, int... nodeIds); + /** + * @see BlockService#getBlockByNum(String, boolean, int...) + */ Request getBlockByNum(String blockNumber, boolean isPlain, int... nodeIds); + /** + * @see BlockService#getBlockByNum(String, boolean, int...) + */ Request getBlockByNum(BigInteger blockNumber, boolean isPlain, int... nodeIds); + /** + * @see BlockService#getBatchBlocksByNum(ArrayList, boolean, int...) + */ Request getBatchBlocksByNum(ArrayList blockNumberList, int... nodeIds); + /** + * @see BlockService#getBatchBlocksByStrNum(ArrayList, boolean, int...) + */ Request getBatchBlocksByNum(ArrayList blockNumberList, boolean isPlain, int... nodeIds); + /** + * @see BlockService#getBatchBlocksByStrNum(ArrayList, boolean, int...) + */ Request getBatchBlocksByStrNum(ArrayList blockNumberList, int... nodeIds); + /** + * query batch blocks based on block number list. + * + * @param blockNumberList block number list + * @param nodeIds specific ids + * @param isPlain default false, indicating that the returned block includes transaction information within the block. + * If specified, the returned block does not include transactions within the block + * @return {@link Request} of {@link BlockResponse} + */ Request getBatchBlocksByStrNum(ArrayList blockNumberList, boolean isPlain, int... nodeIds); - Request getAvgGenerateTimeByBlockNumber(BigInteger from, BigInteger to, int... nodeIds); - - Request getAvgGenerateTimeByBlockNumber(String from, String to, int... nodeIds); - - Request getBlocksByTime(BigInteger startTime, BigInteger endTime, int... nodeIds); - - Request getBlocksByTime(String startTime, String endTime, int... nodeIds); - - Request getChainHeight(int... nodeIds); - - Request getGenesisBlock(int... nodeIds); + /** + * @see BlockService#getAvgGenerateTimeByBlockNumber(String, String, int...) + */ + Request getAvgGenerateTimeByBlockNumber(BigInteger from, BigInteger to, int... nodeIds); + + /** + * query block average generation time. + * + * @param from start number of block + * @param to end number of block + * @param nodeIds specific ids + * @return {@link Request} of {@link BlockResponse} + */ + Request getAvgGenerateTimeByBlockNumber(String from, String to, int... nodeIds); + + /** + * querying the count of blocks in a specified time interval. + * + * @param startTime start time + * @param endTime end time + * @param nodeIds specific ids + * @return {@link Request} of {@link BlockResponse} + */ + Request getBlocksByTime(BigInteger startTime, BigInteger endTime, int... nodeIds); + + /** + * @see BlockService#getBlocksByTime(BigInteger, BigInteger, int...) + */ + Request getBlocksByTime(String startTime, String endTime, int... nodeIds); + + /** + * get the latest block number. + * + * @param nodeIds specific ids + * @return {@link Request} of {@link BlockResponse} + */ + Request getChainHeight(int... nodeIds); + + /** + * get the genesis block number. + * + * @param nodeIds specific ids + * @return {@link Request} of {@link BlockResponse} + */ + Request getGenesisBlock(int... nodeIds); } diff --git a/src/main/java/cn/hyperchain/sdk/service/MQService.java b/src/main/java/cn/hyperchain/sdk/service/MQService.java index 5d43c15f..88077779 100644 --- a/src/main/java/cn/hyperchain/sdk/service/MQService.java +++ b/src/main/java/cn/hyperchain/sdk/service/MQService.java @@ -1,22 +1,65 @@ package cn.hyperchain.sdk.service; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.MQResponse; +import cn.hyperchain.sdk.response.mq.MQResponse; import java.util.List; public interface MQService { - + /** + * register mq queue. + * + * @param from account address + * @param queueName queue name that you want to name it + * @param routingkeys what message type you want to receive + * @param isVerbose whether need to push transaction list when push block + * @param nodeIds specific ids + * @return {@link Request} of {@link MQResponse} + */ Request registerQueue(String from, String queueName, List routingkeys, Boolean isVerbose, int... nodeIds); + /** + * unregister mq queue. + * + * @param queueName queue name + * @param exchangerName exchanger name + * @param from account address + * @param nodeIds specific ids + * @return {@link Request} of {@link Request} + */ Request unRegisterQueue(String from, String queueName, String exchangerName, int... nodeIds); + /** + * get all queue names. + * + * @param nodeIds specific ids + * @return {@link Request} of {@link MQResponse} + */ Request getAllQueueNames(int... nodeIds); + /** + * inform mq server of starting work. + * + * @param nodeIds specific ids + * @return {@link Request} of {@link MQResponse} + */ Request informNormal(int... nodeIds); + /** + * get exchanger names. + * + * @param nodeIds specific ids + * @return {@link Request} of {@link MQResponse} + */ Request getExchangerName(int... nodeIds); + /** + * delete exchanger. + * + * @param exchangerName the name of exchange that you want to delete + * @param nodeIds specific ids + * @return {@link Request} of {@link MQResponse} + */ Request deleteExchanger(String exchangerName, int... nodeIds); } diff --git a/src/main/java/cn/hyperchain/sdk/service/NodeService.java b/src/main/java/cn/hyperchain/sdk/service/NodeService.java index 08dafd02..f4cead30 100644 --- a/src/main/java/cn/hyperchain/sdk/service/NodeService.java +++ b/src/main/java/cn/hyperchain/sdk/service/NodeService.java @@ -1,7 +1,7 @@ package cn.hyperchain.sdk.service; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.NodeResponse; +import cn.hyperchain.sdk.response.node.NodeResponse; public interface NodeService { Request getNodes(int... ids); diff --git a/src/main/java/cn/hyperchain/sdk/service/RadarService.java b/src/main/java/cn/hyperchain/sdk/service/RadarService.java index b6232c95..91f54d70 100644 --- a/src/main/java/cn/hyperchain/sdk/service/RadarService.java +++ b/src/main/java/cn/hyperchain/sdk/service/RadarService.java @@ -1,8 +1,16 @@ package cn.hyperchain.sdk.service; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.RadarResponse; +import cn.hyperchain.sdk.response.radar.RadarResponse; public interface RadarService { + /** + * to listen contract. + * + * @param sourceCode solidity source code + * @param contractAddress contract address + * @param nodeIds specific ids + * @return {@link Request} of {@link RadarResponse} + */ Request listenContract(String sourceCode, String contractAddress, int... nodeIds); } diff --git a/src/main/java/cn/hyperchain/sdk/service/TxService.java b/src/main/java/cn/hyperchain/sdk/service/TxService.java index 6d9bc487..3cff034e 100644 --- a/src/main/java/cn/hyperchain/sdk/service/TxService.java +++ b/src/main/java/cn/hyperchain/sdk/service/TxService.java @@ -2,7 +2,7 @@ import cn.hyperchain.sdk.request.Request; import cn.hyperchain.sdk.response.ReceiptResponse; -import cn.hyperchain.sdk.response.TxResponse; +import cn.hyperchain.sdk.response.tx.TxResponse; import java.math.BigInteger; import java.util.ArrayList; diff --git a/src/main/java/cn/hyperchain/sdk/service/impl/BlockServiceImpl.java b/src/main/java/cn/hyperchain/sdk/service/impl/BlockServiceImpl.java index b04844dc..bb555632 100644 --- a/src/main/java/cn/hyperchain/sdk/service/impl/BlockServiceImpl.java +++ b/src/main/java/cn/hyperchain/sdk/service/impl/BlockServiceImpl.java @@ -3,7 +3,10 @@ import cn.hyperchain.sdk.provider.ProviderManager; import cn.hyperchain.sdk.request.BlockRequest; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.BlockResponse; +import cn.hyperchain.sdk.response.block.BlockAvgTimeResponse; +import cn.hyperchain.sdk.response.block.BlockCountResponse; +import cn.hyperchain.sdk.response.block.BlockNumberResponse; +import cn.hyperchain.sdk.response.block.BlockResponse; import cn.hyperchain.sdk.service.BlockService; import java.math.BigInteger; @@ -24,90 +27,53 @@ public BlockServiceImpl(ProviderManager providerManager) { this.providerManager = providerManager; } - /** - * get latest block. - * - * @param nodeIds specific ids - * @return {@link Request} of {@link BlockResponse} - */ @Override public Request getLatestBlock(int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "latestBlock", providerManager, BlockResponse.class, nodeIds); + BlockRequest blockResponseBlockRequest = new BlockRequest(BLOCK_PREFIX + "latestBlock", providerManager, BlockResponse.class, nodeIds); return blockResponseBlockRequest; } - /** - * @see BlockServiceImpl#getBlocks(String, String, boolean, int...) - */ + @Override public Request getBlocks(BigInteger from, BigInteger to, int... nodeIds) { return getBlocks(from.toString(), to.toString(), nodeIds); } - /** - * @see BlockServiceImpl#getBlocks(String, String, boolean, int...) - */ + @Override public Request getBlocks(String from, String to, int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getBlocks", providerManager, BlockResponse.class, nodeIds); - HashMap params = new HashMap<>(); - params.put("from", from); - params.put("to", to); - blockResponseBlockRequest.addParams(params); - - return blockResponseBlockRequest; + return getBlocks(from, to, false, nodeIds); } - /** - * @see BlockServiceImpl#getBlocks(String, String, boolean, int...) - */ + @Override public Request getBlocks(BigInteger from, BigInteger to, boolean isPlain, int... nodeIds) { return getBlocks(from.toString(), to.toString(), isPlain, nodeIds); } - /** - * query the block of the specified block interval. - * - * @param from start block number - * @param to end block number - * @param isPlain default false, indicating that the returned block includes transaction information within the block. - * If specified, the returned block does not include transactions within the block - * @param nodeIds specific ids - * @return {@link Request} of {@link BlockResponse} - */ + @Override public Request getBlocks(String from, String to, boolean isPlain, int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getBlocks", providerManager, BlockResponse.class, nodeIds); + BlockRequest blockRequest = new BlockRequest(BLOCK_PREFIX + "getBlocks", providerManager, BlockResponse.class, nodeIds); HashMap params = new HashMap<>(); params.put("from", from); params.put("to", to); params.put("isPlain", isPlain); - blockResponseBlockRequest.addParams(params); + blockRequest.addParams(params); - return blockResponseBlockRequest; + return blockRequest; } - /** - * @see BlockServiceImpl#getBlockByHash(String, boolean, int...) - */ + @Override public Request getBlockByHash(String blockHash, int... nodeIds) { return getBlockByHash(blockHash, false); } - /** - * get block by hash. - * - * @param blockHash block hash - * @param isPlain default false, indicating that the returned block includes transaction information within the block. - * If specified, the returned block does not include transactions within the block - * @param nodeIds specific ids - * @return {@link Request} of {@link BlockResponse} - */ + @Override public Request getBlockByHash(String blockHash, boolean isPlain, int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getBlockByHash", providerManager, BlockResponse.class, nodeIds); + BlockRequest blockResponseBlockRequest = new BlockRequest(BLOCK_PREFIX + "getBlockByHash", providerManager, BlockResponse.class, nodeIds); blockResponseBlockRequest.addParams(blockHash); blockResponseBlockRequest.addParams(isPlain); @@ -115,53 +81,37 @@ public Request getBlockByHash(String blockHash, boolean isPlain, return blockResponseBlockRequest; } - /** - * @see BlockServiceImpl#getBatchBlocksByHash(ArrayList, boolean, int...) - */ + @Override public Request getBatchBlocksByHash(ArrayList blockHashList, int... nodeIds) { return getBatchBlocksByHash(blockHashList, false); } - /** - * get batch blocks based on hash list. - * - * @param blockHashList block hash list - * @param isPlain default false, indicating that the returned block includes transaction information within the block. - * If specified, the returned block does not include transactions within the block - * @param nodeIds specific ids - * @return {@link Request} of {@link BlockResponse} - */ + @Override public Request getBatchBlocksByHash(ArrayList blockHashList, boolean isPlain, int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getBatchBlocksByHash", providerManager, BlockResponse.class, nodeIds); + BlockRequest blockRequest = new BlockRequest(BLOCK_PREFIX + "getBatchBlocksByHash", providerManager, BlockResponse.class, nodeIds); HashMap params = new HashMap<>(); params.put("hashes", blockHashList); params.put("isPlain", isPlain); - blockResponseBlockRequest.addParams(params); + blockRequest.addParams(params); - return blockResponseBlockRequest; + return blockRequest; } - /** - * @see BlockServiceImpl#getBlockByNum(String, boolean, int...) - */ + @Override public Request getBlockByNum(BigInteger blockNumber, int... nodeIds) { return getBlockByNum(blockNumber.toString()); } - /** - * @see BlockServiceImpl#getBlockByNum(String, boolean, int...) - */ + @Override public Request getBlockByNum(String blockNumber, int... nodeIds) { return getBlockByNum(blockNumber, false); } - /** - * @see BlockServiceImpl#getBlockByNum(String, boolean, int...) - */ + @Override public Request getBlockByNum(BigInteger blockNumber, boolean isPlain, int... nodeIds) { return getBlockByNum(blockNumber.toString(), isPlain, nodeIds); @@ -178,26 +128,22 @@ public Request getBlockByNum(BigInteger blockNumber, boolean isPl */ @Override public Request getBlockByNum(String blockNumber, boolean isPlain, int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getBlockByNumber", providerManager, BlockResponse.class, nodeIds); - blockResponseBlockRequest.addParams(blockNumber); - blockResponseBlockRequest.addParams(isPlain); - return blockResponseBlockRequest; + BlockRequest blockRequest = new BlockRequest(BLOCK_PREFIX + "getBlockByNumber", providerManager, BlockResponse.class, nodeIds); + blockRequest.addParams(blockNumber); + blockRequest.addParams(isPlain); + return blockRequest; } - /** - * @see BlockServiceImpl#getBatchBlocksByNum(ArrayList, boolean, int...) - */ + @Override public Request getBatchBlocksByNum(ArrayList blockNumberList, int... nodeIds) { return getBatchBlocksByNum(blockNumberList, false, nodeIds); } - /** - * @see BlockServiceImpl#getBatchBlocksByStrNum(ArrayList, boolean, int...) - */ + @Override public Request getBatchBlocksByNum(ArrayList blockNumberList, boolean isPlain, int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getBatchBlocksByNumber", providerManager, BlockResponse.class, nodeIds); + BlockRequest blockResponseBlockRequest = new BlockRequest(BLOCK_PREFIX + "getBatchBlocksByNumber", providerManager, BlockResponse.class, nodeIds); HashMap params = new HashMap<>(); params.put("numbers", blockNumberList); params.put("isPlain", isPlain); @@ -205,26 +151,16 @@ public Request getBatchBlocksByNum(ArrayList blockNumber return blockResponseBlockRequest; } - /** - * @see BlockServiceImpl#getBatchBlocksByStrNum(ArrayList, boolean, int...) - */ + @Override public Request getBatchBlocksByStrNum(ArrayList blockNumberList, int... nodeIds) { return getBatchBlocksByStrNum(blockNumberList, false, nodeIds); } - /** - * query batch blocks based on block number list. - * - * @param blockNumberList block number list - * @param nodeIds specific ids - * @param isPlain default false, indicating that the returned block includes transaction information within the block. - * If specified, the returned block does not include transactions within the block - * @return {@link Request} of {@link BlockResponse} - */ + @Override public Request getBatchBlocksByStrNum(ArrayList blockNumberList, boolean isPlain, int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getBatchBlocksByNumber", providerManager, BlockResponse.class, nodeIds); + BlockRequest blockResponseBlockRequest = new BlockRequest(BLOCK_PREFIX + "getBatchBlocksByNumber", providerManager, BlockResponse.class, nodeIds); HashMap params = new HashMap<>(); params.put("numbers", blockNumberList); params.put("isPlain", isPlain); @@ -232,82 +168,52 @@ public Request getBatchBlocksByStrNum(ArrayList blockNumb return blockResponseBlockRequest; } - /** - * @see BlockServiceImpl#getAvgGenerateTimeByBlockNumber(String, String, int...) - */ + @Override - public Request getAvgGenerateTimeByBlockNumber(BigInteger from, BigInteger to, int... nodeIds) { + public Request getAvgGenerateTimeByBlockNumber(BigInteger from, BigInteger to, int... nodeIds) { return getAvgGenerateTimeByBlockNumber(from.toString(), to.toString(), nodeIds); } - /** - * query block average generation time. - * - * @param from start number of block - * @param to end number of block - * @param nodeIds specific ids - * @return {@link Request} of {@link BlockResponse} - */ + @Override - public Request getAvgGenerateTimeByBlockNumber(String from, String to, int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getAvgGenerateTimeByBlockNumber", providerManager, BlockResponse.class, nodeIds); + public Request getAvgGenerateTimeByBlockNumber(String from, String to, int... nodeIds) { + Request blockRequest = new BlockRequest(BLOCK_PREFIX + "getAvgGenerateTimeByBlockNumber", providerManager, BlockAvgTimeResponse.class, nodeIds); HashMap params = new HashMap<>(); params.put("from", from); params.put("to", to); - blockResponseBlockRequest.addParams(params); - return blockResponseBlockRequest; + blockRequest.addParams(params); + return blockRequest; } - /** - * querying the count of blocks in a specified time interval. - * - * @param startTime start time - * @param endTime end time - * @param nodeIds specific ids - * @return {@link Request} of {@link BlockResponse} - */ + @Override - public Request getBlocksByTime(BigInteger startTime, BigInteger endTime, int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getBlocksByTime", providerManager, BlockResponse.class, nodeIds); + public Request getBlocksByTime(BigInteger startTime, BigInteger endTime, int... nodeIds) { + BlockRequest blockRequest = new BlockRequest(BLOCK_PREFIX + "getBlocksByTime", providerManager, BlockCountResponse.class, nodeIds); HashMap params = new HashMap<>(); params.put("startTime", startTime); params.put("endTime", endTime); - blockResponseBlockRequest.addParams(params); - return blockResponseBlockRequest; + blockRequest.addParams(params); + return blockRequest; } - /** - * @see BlockServiceImpl#getBlocksByTime(BigInteger, BigInteger, int...) - */ + @Override - public Request getBlocksByTime(String startTime, String endTime, int... nodeIds) { + public Request getBlocksByTime(String startTime, String endTime, int... nodeIds) { return getBlocksByTime(new BigInteger(startTime), new BigInteger(endTime), nodeIds); } - /** - * get the latest block number. - * - * @param nodeIds specific ids - * @return {@link Request} of {@link BlockResponse} - */ @Override - public Request getChainHeight(int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getChainHeight", providerManager, BlockResponse.class, nodeIds); - return blockResponseBlockRequest; + public Request getChainHeight(int... nodeIds) { + BlockRequest blockRequest = new BlockRequest(BLOCK_PREFIX + "getChainHeight", providerManager, BlockNumberResponse.class, nodeIds); + return blockRequest; } - /** - * get the genesis block number. - * - * @param nodeIds specific ids - * @return {@link Request} of {@link BlockResponse} - */ @Override - public Request getGenesisBlock(int... nodeIds) { - BlockRequest blockResponseBlockRequest = new BlockRequest<>(BLOCK_PREFIX + "getGenesisBlock", providerManager, BlockResponse.class, nodeIds); - return blockResponseBlockRequest; + public Request getGenesisBlock(int... nodeIds) { + BlockRequest blockRequest = new BlockRequest(BLOCK_PREFIX + "getGenesisBlock", providerManager, BlockNumberResponse.class, nodeIds); + return blockRequest; } } diff --git a/src/main/java/cn/hyperchain/sdk/service/impl/MQServiceImpl.java b/src/main/java/cn/hyperchain/sdk/service/impl/MQServiceImpl.java index d460affb..7b58b690 100644 --- a/src/main/java/cn/hyperchain/sdk/service/impl/MQServiceImpl.java +++ b/src/main/java/cn/hyperchain/sdk/service/impl/MQServiceImpl.java @@ -3,7 +3,7 @@ import cn.hyperchain.sdk.provider.ProviderManager; import cn.hyperchain.sdk.request.MQRequest; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.MQResponse; +import cn.hyperchain.sdk.response.mq.MQResponse; import cn.hyperchain.sdk.service.MQService; import java.util.HashMap; @@ -18,19 +18,9 @@ public MQServiceImpl(ProviderManager providerManager) { this.providerManager = providerManager; } - - /** - * register mq queue. - * @param from account address - * @param queueName queue name that you want to name it - * @param routingkeys what message type you want to receive - * @param isVerbose whether need to push transaction list when push block - * @param nodeIds specific ids - * @return {@link Request} of {@link MQResponse} - */ @Override public Request registerQueue(String from, String queueName, List routingkeys, Boolean isVerbose, int... nodeIds) { - MQRequest mqResponseMQRequest = new MQRequest(MQ_PREFIX + "register", providerManager, MQResponse.class, nodeIds); + MQRequest mqResponseMQRequest = new MQRequest(MQ_PREFIX + "register", providerManager, MQResponse.class, nodeIds); Map params = new HashMap<>(); params.put("from", from); @@ -43,67 +33,42 @@ public Request registerQueue(String from, String queueName, List getAllQueueNames(int... nodeIds) { - MQRequest mqResponseMQRequest = new MQRequest<>(MQ_PREFIX + "getAllQueueNames", providerManager, MQResponse.class, nodeIds); + public Request unRegisterQueue(String from, String queueName, String exchangerName, int... nodeIds) { + MQRequest mqResponseMQRequest = new MQRequest(MQ_PREFIX + "unRegister", providerManager, MQResponse.class, nodeIds); + mqResponseMQRequest.addParams(queueName); + mqResponseMQRequest.addParams(exchangerName); + mqResponseMQRequest.addParams(from); + mqResponseMQRequest.addParams(""); return mqResponseMQRequest; } - /** - * inform mq server of starting work. - * @param nodeIds specific ids - * @return {@link Request} of {@link MQResponse} - */ + @Override - public Request informNormal(int... nodeIds) { - MQRequest mqResponseMQRequest = new MQRequest<>(MQ_PREFIX + "informNormal", providerManager, MQResponse.class, nodeIds); - mqResponseMQRequest.addParams(""); + public Request getAllQueueNames(int... nodeIds) { + MQRequest mqResponseMQRequest = new MQRequest(MQ_PREFIX + "getAllQueueNames", providerManager, MQResponse.class, nodeIds); return mqResponseMQRequest; } - /** - * unregister mq queue. - * @param queueName queue name - * @param exchangerName exchanger name - * @param from account address - * @param nodeIds specific ids - * @return {@link Request} of {@link Request} - */ + @Override - public Request unRegisterQueue(String from, String queueName, String exchangerName, int... nodeIds) { - MQRequest mqResponseMQRequest = new MQRequest<>(MQ_PREFIX + "unRegister", providerManager, MQResponse.class, nodeIds); - mqResponseMQRequest.addParams(queueName); - mqResponseMQRequest.addParams(exchangerName); - mqResponseMQRequest.addParams(from); + public Request informNormal(int... nodeIds) { + MQRequest mqResponseMQRequest = new MQRequest(MQ_PREFIX + "informNormal", providerManager, MQResponse.class, nodeIds); mqResponseMQRequest.addParams(""); return mqResponseMQRequest; } - /** - * get exchanger names. - * @param nodeIds specific ids - * @return {@link Request} of {@link MQResponse} - */ + @Override public Request getExchangerName(int... nodeIds) { - MQRequest mqResponseMQRequest = new MQRequest<>(MQ_PREFIX + "getExchangerName", providerManager, MQResponse.class, nodeIds); + MQRequest mqResponseMQRequest = new MQRequest(MQ_PREFIX + "getExchangerName", providerManager, MQResponse.class, nodeIds); return mqResponseMQRequest; } - /** - * delete exchanger. - * @param exchangerName the name of exchange that you want to delete - * @param nodeIds specific ids - * @return {@link Request} of {@link MQResponse} - */ + @Override public Request deleteExchanger(String exchangerName, int... nodeIds) { - MQRequest mqResponseMQRequest = new MQRequest<>(MQ_PREFIX + "deleteExchanger", providerManager, MQResponse.class, nodeIds); + MQRequest mqResponseMQRequest = new MQRequest(MQ_PREFIX + "deleteExchanger", providerManager, MQResponse.class, nodeIds); mqResponseMQRequest.addParams(exchangerName); return mqResponseMQRequest; } diff --git a/src/main/java/cn/hyperchain/sdk/service/impl/NodeServiceImpl.java b/src/main/java/cn/hyperchain/sdk/service/impl/NodeServiceImpl.java index 06862335..49a339df 100644 --- a/src/main/java/cn/hyperchain/sdk/service/impl/NodeServiceImpl.java +++ b/src/main/java/cn/hyperchain/sdk/service/impl/NodeServiceImpl.java @@ -3,11 +3,10 @@ import cn.hyperchain.sdk.provider.ProviderManager; import cn.hyperchain.sdk.request.NodeRequest; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.NodeResponse; +import cn.hyperchain.sdk.response.node.NodeResponse; import cn.hyperchain.sdk.service.NodeService; public class NodeServiceImpl implements NodeService { - private ProviderManager providerManager; private static final String NODE_PREFIX = "node_"; @@ -17,7 +16,7 @@ public NodeServiceImpl(ProviderManager providerManager) { @Override public Request getNodes(int... ids) { - NodeRequest nodeRequest = new NodeRequest(NODE_PREFIX + "getNodes", providerManager, NodeResponse.class, ids); + NodeRequest nodeRequest = new NodeRequest(NODE_PREFIX + "getNodes", providerManager, NodeResponse.class, ids); return nodeRequest; } } diff --git a/src/main/java/cn/hyperchain/sdk/service/impl/RadarServiceImpl.java b/src/main/java/cn/hyperchain/sdk/service/impl/RadarServiceImpl.java index aa3fc0f2..a6ac01eb 100644 --- a/src/main/java/cn/hyperchain/sdk/service/impl/RadarServiceImpl.java +++ b/src/main/java/cn/hyperchain/sdk/service/impl/RadarServiceImpl.java @@ -3,7 +3,7 @@ import cn.hyperchain.sdk.provider.ProviderManager; import cn.hyperchain.sdk.request.RadarRequest; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.RadarResponse; +import cn.hyperchain.sdk.response.radar.RadarResponse; import cn.hyperchain.sdk.service.RadarService; import java.util.HashMap; @@ -17,16 +17,10 @@ public RadarServiceImpl(ProviderManager providerManager) { this.providerManager = providerManager; } - /** - * to listen contract. - * @param sourceCode solidity source code - * @param contractAddress contract address - * @param nodeIds specific ids - * @return {@link Request} of {@link RadarResponse} - */ + @Override public Request listenContract(String sourceCode, String contractAddress, int... nodeIds) { - RadarRequest radarResponseRequest = new RadarRequest(RADAR_PRE + "registerContract", providerManager, RadarResponse.class, nodeIds); + RadarRequest radarResponseRequest = new RadarRequest(RADAR_PRE + "registerContract", providerManager, RadarResponse.class, nodeIds); Map metas = new HashMap<>(); metas.put("source", sourceCode); metas.put("address", contractAddress); diff --git a/src/main/java/cn/hyperchain/sdk/service/impl/TxServiceImpl.java b/src/main/java/cn/hyperchain/sdk/service/impl/TxServiceImpl.java index ece7bd7c..4f5f016c 100644 --- a/src/main/java/cn/hyperchain/sdk/service/impl/TxServiceImpl.java +++ b/src/main/java/cn/hyperchain/sdk/service/impl/TxServiceImpl.java @@ -5,7 +5,7 @@ import cn.hyperchain.sdk.request.Request; import cn.hyperchain.sdk.request.TxRequest; import cn.hyperchain.sdk.response.ReceiptResponse; -import cn.hyperchain.sdk.response.TxResponse; +import cn.hyperchain.sdk.response.tx.TxResponse; import cn.hyperchain.sdk.service.TxService; import java.math.BigInteger; diff --git a/src/test/java/cn/hyperchain/sdk/service/BlockServiceTest.java b/src/test/java/cn/hyperchain/sdk/service/BlockServiceTest.java index e66fab01..ef5a2708 100644 --- a/src/test/java/cn/hyperchain/sdk/service/BlockServiceTest.java +++ b/src/test/java/cn/hyperchain/sdk/service/BlockServiceTest.java @@ -6,10 +6,15 @@ import cn.hyperchain.sdk.common.utils.FileUtil; import cn.hyperchain.sdk.exception.RequestException; import cn.hyperchain.sdk.provider.ProviderManager; +import cn.hyperchain.sdk.request.BlockRequest; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.BlockResponse; import cn.hyperchain.sdk.response.ReceiptResponse; -import cn.hyperchain.sdk.response.TxResponse; +import cn.hyperchain.sdk.response.Response; +import cn.hyperchain.sdk.response.block.BlockAvgTimeResponse; +import cn.hyperchain.sdk.response.block.BlockCountResponse; +import cn.hyperchain.sdk.response.block.BlockNumberResponse; +import cn.hyperchain.sdk.response.block.BlockResponse; +import cn.hyperchain.sdk.response.tx.TxResponse; import cn.hyperchain.sdk.transaction.Transaction; import org.junit.BeforeClass; import org.junit.Ignore; @@ -90,7 +95,7 @@ public static void deploy() throws RequestException { public void testGetLatestBlock() throws RequestException { Request blockResponseBlockRequest = blockService.getLatestBlock(); BlockResponse blockResponse = blockResponseBlockRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -98,7 +103,7 @@ public void testGetBlocks() throws RequestException { Request blockResponseRequest = blockService.getBlocks(BigInteger.valueOf(1), BigInteger.valueOf(2)); BlockResponse blockResponse = blockResponseRequest.send(); System.out.println(blockResponse); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -106,7 +111,7 @@ public void testGetBlocks1() throws RequestException { Request blockResponseRequest = blockService.getBlocks(String.valueOf(1), String.valueOf(2)); BlockResponse blockResponse = blockResponseRequest.send(); System.out.println(blockResponse); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -115,7 +120,7 @@ public void testGetBlocks2() throws RequestException { BlockResponse blockResponse = blockResponseRequest.send(); System.out.println(blockResponse); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -125,17 +130,18 @@ public void testGetBlocks3() throws RequestException { BlockResponse blockResponse = blockResponseRequest.send(); System.out.println(blockResponse); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test public void testGetBlockByHash() throws RequestException { String blockHash = blockHashes.get(0); +// String blockHash = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; Request blockResponseRequest = blockService.getBlockByHash(blockHash); BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -149,7 +155,7 @@ public void testGetBatchBlocksByHash() throws RequestException { Request responseRequest = blockService.getBatchBlocksByHash(blockHashes); BlockResponse blockResponse = responseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -162,7 +168,7 @@ public void testGetBatchBlocksByHash1() throws RequestException { Request responseRequest = blockService.getBatchBlocksByHash(blockHashes, true); BlockResponse blockResponse = responseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -172,7 +178,7 @@ public void testGetBlockByNum() throws RequestException { Request blockResponseRequest = blockService.getBlockByNum(blockNum); BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -182,7 +188,7 @@ public void testGetBlockByNum1() throws RequestException { Request blockResponseRequest = blockService.getBlockByNum(blockNum); BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -192,7 +198,7 @@ public void testGetBlockByNum2() throws RequestException { Request blockResponseRequest = blockService.getBlockByNum(blockNum, false); BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -202,7 +208,7 @@ public void testGetBlockByNum3() throws RequestException { Request blockResponseRequest = blockService.getBlockByNum(blockNum, false); BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -214,7 +220,7 @@ public void testGetBatchBlocksByNum() throws RequestException { Request blockResponseRequest = blockService.getBatchBlocksByNum(blockNums); BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -226,7 +232,7 @@ public void testGetBatchBlocksByNum1() throws RequestException { Request blockResponseRequest = blockService.getBatchBlocksByNum(blockNums, false); BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -238,7 +244,7 @@ public void testGetBtachBlocksByStrNum() throws RequestException { Request blockResponseRequest = blockService.getBatchBlocksByStrNum(blockNums); BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -250,7 +256,7 @@ public void testGetBtachBlocksByStrNum1() throws RequestException { Request blockResponseRequest = blockService.getBatchBlocksByStrNum(blockNums, false); BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocks()); + System.out.println(blockResponse.getResult()); } @Test @@ -258,10 +264,10 @@ public void testGetAvgGenerateTimeByBlockNumber() throws RequestException { BigInteger from = BigInteger.valueOf(1); BigInteger to = BigInteger.valueOf(2); - Request blockResponseRequest = blockService.getAvgGenerateTimeByBlockNumber(from, to); - BlockResponse blockResponse = blockResponseRequest.send(); + Request blockRequest = blockService.getAvgGenerateTimeByBlockNumber(from, to); + BlockAvgTimeResponse blockResponse = blockRequest.send(); - System.out.println(blockResponse.getAvgGenerateTime()); + System.out.println(blockResponse); } @Test @@ -269,10 +275,10 @@ public void testGetAvgGenerateTimeByBlockNumber1() throws RequestException { String from = String.valueOf(1); String to = String.valueOf(2); - Request blockResponseRequest = blockService.getAvgGenerateTimeByBlockNumber(from, to); - BlockResponse blockResponse = blockResponseRequest.send(); + Request blockRequest = blockService.getAvgGenerateTimeByBlockNumber(from, to); + BlockAvgTimeResponse blockAvgTimeResponse = blockRequest.send(); - System.out.println(blockResponse.getAvgGenerateTime()); + System.out.println(blockAvgTimeResponse); } @Test @@ -282,10 +288,10 @@ public void testGetBlocksByTime() throws RequestException { BigInteger endTime = BigInteger.valueOf(1559193987434588900L); - Request blockResponseRequest = blockService.getBlocksByTime(startTime, endTime); - BlockResponse blockResponse = blockResponseRequest.send(); + BlockRequest blockResponseRequest = (BlockRequest) blockService.getBlocksByTime(startTime, endTime); + Response blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlocksCount()); + System.out.println(blockResponse); } @Test @@ -294,24 +300,25 @@ public void testGetBlocksByTime1() throws RequestException { String startTime = String.valueOf(1559549200); String endTime = String.valueOf(1559549300); - Request blockResponseRequest = blockService.getBlocksByTime(startTime, endTime); - BlockResponse blockResponse = blockResponseRequest.send(); + Request blockRequest = blockService.getBlocksByTime(startTime, endTime); + BlockCountResponse blockResponse = blockRequest.send(); - System.out.println(blockResponse.getBlocksCount()); + System.out.println(blockResponse); } @Test public void testGetChainHeight() throws RequestException { - Request blockResponseRequest = blockService.getChainHeight(); - BlockResponse blockResponse = blockResponseRequest.send(); + Request blockRequest = blockService.getChainHeight(); + BlockNumberResponse blockNumberResponse = blockRequest.send(); - System.out.println(blockResponse.getBlockNumber()); + System.out.println(blockNumberResponse); + System.out.println(blockNumberResponse.getResult()); } @Test public void testGetGenesisBlock() throws RequestException { - Request blockResponseRequest = blockService.getGenesisBlock(); - BlockResponse blockResponse = blockResponseRequest.send(); - System.out.println(blockResponse.getBlockNumber()); + Request blockRequest = blockService.getGenesisBlock(); + BlockNumberResponse blockNumberResponse = blockRequest.send(); + System.out.println(blockNumberResponse.getResult()); } } diff --git a/src/test/java/cn/hyperchain/sdk/service/MQServiceTest.java b/src/test/java/cn/hyperchain/sdk/service/MQServiceTest.java index 746c9ea4..1423d77e 100644 --- a/src/test/java/cn/hyperchain/sdk/service/MQServiceTest.java +++ b/src/test/java/cn/hyperchain/sdk/service/MQServiceTest.java @@ -3,7 +3,7 @@ import cn.hyperchain.sdk.exception.RequestException; import cn.hyperchain.sdk.provider.ProviderManager; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.MQResponse; +import cn.hyperchain.sdk.response.mq.MQResponse; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/cn/hyperchain/sdk/service/NodeServiceTest.java b/src/test/java/cn/hyperchain/sdk/service/NodeServiceTest.java index 2ca87cca..cc1541c2 100644 --- a/src/test/java/cn/hyperchain/sdk/service/NodeServiceTest.java +++ b/src/test/java/cn/hyperchain/sdk/service/NodeServiceTest.java @@ -2,17 +2,16 @@ import cn.hyperchain.sdk.exception.RequestException; import cn.hyperchain.sdk.provider.ProviderManager; -import cn.hyperchain.sdk.response.NodeResponse; +import cn.hyperchain.sdk.response.node.NodeResponse; import org.junit.Test; public class NodeServiceTest { - private ProviderManager providerManager = Common.providerManager; private NodeService nodeService = ServiceManager.getNodeService(providerManager); @Test public void testGetNode() throws RequestException { NodeResponse nodeResponse = nodeService.getNodes().send(); - System.out.println(nodeResponse.getNodes()); + System.out.println(nodeResponse.getResult()); } } diff --git a/src/test/java/cn/hyperchain/sdk/service/RadarServiceTest.java b/src/test/java/cn/hyperchain/sdk/service/RadarServiceTest.java index 158a58da..aa01d2f2 100644 --- a/src/test/java/cn/hyperchain/sdk/service/RadarServiceTest.java +++ b/src/test/java/cn/hyperchain/sdk/service/RadarServiceTest.java @@ -5,12 +5,10 @@ import cn.hyperchain.sdk.common.solidity.Abi; import cn.hyperchain.sdk.common.utils.FileUtil; import cn.hyperchain.sdk.exception.RequestException; -import cn.hyperchain.sdk.provider.DefaultHttpProvider; -import cn.hyperchain.sdk.provider.HttpProvider; import cn.hyperchain.sdk.provider.ProviderManager; import cn.hyperchain.sdk.request.Request; -import cn.hyperchain.sdk.response.RadarResponse; import cn.hyperchain.sdk.response.ReceiptResponse; +import cn.hyperchain.sdk.response.radar.RadarResponse; import cn.hyperchain.sdk.transaction.Transaction; import org.junit.BeforeClass; import org.junit.Ignore; @@ -19,9 +17,7 @@ import java.io.IOException; public class RadarServiceTest { - private static String url = "localhost:8081"; - private static HttpProvider httpProvider = new DefaultHttpProvider.Builder().setUrl(url).build(); - private static ProviderManager providerManager = new ProviderManager.Builder().providers(httpProvider).build(); + private static ProviderManager providerManager = Common.soloProviderManager; private static RadarService radarService = ServiceManager.getRadarService(providerManager); private static String contractAddress = null; diff --git a/src/test/java/cn/hyperchain/sdk/service/TxServiceTest.java b/src/test/java/cn/hyperchain/sdk/service/TxServiceTest.java index 116be480..fee7772e 100644 --- a/src/test/java/cn/hyperchain/sdk/service/TxServiceTest.java +++ b/src/test/java/cn/hyperchain/sdk/service/TxServiceTest.java @@ -8,7 +8,7 @@ import cn.hyperchain.sdk.provider.ProviderManager; import cn.hyperchain.sdk.request.Request; import cn.hyperchain.sdk.response.ReceiptResponse; -import cn.hyperchain.sdk.response.TxResponse; +import cn.hyperchain.sdk.response.tx.TxResponse; import cn.hyperchain.sdk.transaction.Transaction; import org.junit.BeforeClass; import org.junit.Ignore;