Merge pull request #17 from CoboCustody/mpc_api

update mpc api
CoboGlobal · Nov 17, 2022 · f62fdc1 · f62fdc1
2 parents 2ba2ea3 + 0060ca3
commit f62fdc1
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 34 deletions.
diff --git a/src/main/java/com/cobo/custody/api/client/CoboMPCApiRestClient.java b/src/main/java/com/cobo/custody/api/client/CoboMPCApiRestClient.java
@@ -18,7 +18,7 @@ public interface CoboMPCApiRestClient {
     ApiResponse<MPCAddresses> getAddressList(String chainCode, int pageIndex, int pageLength, Integer sortFlag);
     ApiResponse<MPCWalletAsset> getWalletAssetList(String address, String chainCode);
     ApiResponse<Void> createTransaction(String coin, String requestId, String fromAddr, String toAddr, BigInteger amount);
-    ApiResponse<MPCTransactionInfo> getTransaction(String requestId, String txId);
+    ApiResponse<MPCTransactionInfo> getTransaction(String requestId);
     ApiResponse<MPCTransactions> listWalletTransactions(String address, String coin,
                                                         String maxId, String minId,
                                                         Integer limit);

diff --git a/src/main/java/com/cobo/custody/api/client/domain/asset/MPCAssetCoinInfo.java b/src/main/java/com/cobo/custody/api/client/domain/asset/MPCAssetCoinInfo.java
@@ -4,8 +4,8 @@
 
 public class MPCAssetCoinInfo {
     private String coin;
-    @JsonProperty(value = "chain_coin")
-    private String chainCoin;
+    @JsonProperty(value = "chain_code")
+    private String chainCode;
     @JsonProperty(value = "display_code")
     private String displayCode;
     private String description;
@@ -19,12 +19,12 @@ public void setCoin(String coin) {
         this.coin = coin;
     }
 
-    public String getChainCoin() {
-        return chainCoin;
+    public String getChainCode() {
+        return chainCode;
     }
 
-    public void setChainCoin(String chainCoin) {
-        this.chainCoin = chainCoin;
+    public void setChainCode(String chainCode) {
+        this.chainCode = chainCode;
     }
 
     public String getDisplayCode() {
@@ -55,7 +55,7 @@ public void setAmount(Long amount) {
     public String toString() {
         return "{" +
                 "coin='" + coin + '\'' +
-                ", chain_coin='" + chainCoin + '\'' +
+                ", chain_code='" + chainCode + '\'' +
                 ", display_code='" + displayCode + '\'' +
                 ", description='" + description + '\'' +
                 ", amount='" + amount + '\'' +

diff --git a/src/main/java/com/cobo/custody/api/client/domain/transaction/MPCTransaction.java b/src/main/java/com/cobo/custody/api/client/domain/transaction/MPCTransaction.java
@@ -6,9 +6,10 @@
 
 public class MPCTransaction {
     private String id;
-    private Long time;
+    @JsonProperty(value = "create_time")
+    private Long createTime;
     private Integer status;
-    @JsonProperty(value = "chain_coin")
+    @JsonProperty(value = "chain_code")
     private String chainCode;
     private String coin;
     private List<Web3Token> tokens;
@@ -21,12 +22,12 @@ public void setId(String id) {
         this.id = id;
     }
 
-    public Long getTime() {
-        return time;
+    public Long getCreateTime() {
+        return createTime;
     }
 
-    public void setTime(Long time) {
-        this.time = time;
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
     }
 
     public Integer getStatus() {
@@ -65,11 +66,11 @@ public void setTokens(List<Web3Token> tokens) {
     public String toString() {
         return "{" +
                 "id='" + id + '\'' +
-                "time='" + time + '\'' +
-                "status='" + status + '\'' +
-                "chain_code='" + chainCode + '\'' +
-                "coin='" + coin + '\'' +
-                "tokens='" + tokens + '\'' +
+                ", create_time='" + createTime + '\'' +
+                ", status='" + status + '\'' +
+                ", chain_code='" + chainCode + '\'' +
+                ", coin='" + coin + '\'' +
+                ", tokens='" + tokens + '\'' +
                 '}';
     }
 }
diff --git a/src/main/java/com/cobo/custody/api/client/domain/transaction/Web3Token.java b/src/main/java/com/cobo/custody/api/client/domain/transaction/Web3Token.java
@@ -24,7 +24,7 @@ public void setAmount(Double amount) {
     public String toString() {
         return "{" +
                 "name='" + name + '\'' +
-                "amount='" + amount + '\'' +
+                ", amount='" + amount + '\'' +
                 '}';
     }
 }
diff --git a/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImpl.java b/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImpl.java
@@ -54,8 +54,8 @@ public ApiResponse<Void> createTransaction(String coin, String requestId, String
     }
 
     @Override
-    public ApiResponse<MPCTransactionInfo> getTransaction(String requestId, String txId) {
-        return executeSync(coboMPCApiService.getTransaction(requestId, txId));
+    public ApiResponse<MPCTransactionInfo> getTransaction(String requestId) {
+        return executeSync(coboMPCApiService.getTransaction(requestId));
     }
 
     @Override

diff --git a/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiService.java b/src/main/java/com/cobo/custody/api/client/impl/CoboMPCApiService.java
@@ -44,8 +44,7 @@ Call<ApiResponse<Void>> createTransaction(@Field("coin") String coin,
                                                         @Field("amount") BigInteger amount);
 
     @GET("/v1/custody/mpc/transaction_info/")
-    Call<ApiResponse<MPCTransactionInfo>> getTransaction(@Query("request_id") String requestId,
-                                                         @Query("tx_id") String txId);
+    Call<ApiResponse<MPCTransactionInfo>> getTransaction(@Query("request_id") String requestId);
 
     @GET("/v1/custody/mpc/list_transactions/")
     Call<ApiResponse<MPCTransactions>> listWalletTransactions(@Query("address") String address,

diff --git a/src/test/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImplTest.java b/src/test/java/com/cobo/custody/api/client/impl/CoboMPCApiRestClientImplTest.java
@@ -40,24 +40,24 @@ public void tearDown() {
     @Test
     public void testGetSupportedChains() {
         ApiResponse<MPCChains> res = mpcClient.getSupportedChains();
-        System.out.println(res);
+        System.out.println(res.getResult());
         assertTrue(res.isSuccess());
     }
 
     @Test
     public void testgetSupportedCoins() {
         String chainCode = "GETH";
         ApiResponse<MPCCoins> res = mpcClient.getSupportedCoins(chainCode);
-        System.out.println(res);
+        System.out.println(res.getResult());
         assertTrue(res.isSuccess());
     }
 
     @Test
     public void testBatchNewAddress() {
         String chainCode = "GETH";
-        int count = 10;
+        int count = 2;
         ApiResponse<MPCAddresses> res = mpcClient.batchNewAddress(chainCode, count);
-        System.out.println(res);
+        System.out.println(res.getResult());
         assertTrue(res.isSuccess());
     }
 
@@ -68,7 +68,7 @@ public void testGetAddressList() {
         int pageLength = 10;
         Integer sortFlag = 0;
         ApiResponse<MPCAddresses> res = mpcClient.getAddressList(chainCode, pageIndex, pageLength, sortFlag);
-        System.out.println(res);
+        System.out.println(res.getResult());
         assertTrue(res.isSuccess());
     }
 
@@ -77,7 +77,7 @@ public void testGetWalletAssetList() {
         String address = "0x4897e732734a7b4265cf48201b0ad2adb06657ba";
         String chainCode = "GETH";
         ApiResponse<MPCWalletAsset> res = mpcClient.getWalletAssetList(address, chainCode);
-        System.out.println(res);
+        System.out.println(res.getResult());
         assertTrue(res.isSuccess());
     }
 
@@ -89,14 +89,15 @@ public void testCreateTransaction() {
         String toAddr = "0xEEACb7a5e53600c144C0b9839A834bb4b39E540c";
         BigInteger amount = new BigInteger("10");
         ApiResponse<Void> res = mpcClient.createTransaction(coin, requestId, fromAddr, toAddr, amount);
+        System.out.println(requestId);
         assertTrue(res.isSuccess());
     }
 
     @Test
     public void testGetTransaction() {
-        String requestId = "1668492939032";
-        ApiResponse<MPCTransactionInfo> res = mpcClient.getTransaction(requestId, null);
-        System.out.println(res);
+        String requestId = "1668678820274";
+        ApiResponse<MPCTransactionInfo> res = mpcClient.getTransaction(requestId);
+        System.out.println(res.getResult());
         assertTrue(res.isSuccess());
     }
 
@@ -109,7 +110,7 @@ public void testListWalletTransactions() {
         int limit = 10;
 
         ApiResponse<MPCTransactions> res = mpcClient.listWalletTransactions(address, coin, maxId, minId, limit);
-        System.out.println(res);
+        System.out.println(res.getResult());
         assertTrue(res.isSuccess());
     }
 }