<fix>(codec,auth): fix bytes codec and fix auth interface.

kyonRay · kyonRay · commit 786d5c795072 · 2021-12-06T19:46:36.000+08:00
diff --git a/sdk-codec/src/main/java/org/fisco/bcos/sdk/codec/ABICodec.java b/sdk-codec/src/main/java/org/fisco/bcos/sdk/codec/ABICodec.java
@@ -213,7 +213,11 @@ private Type buildType(ABIDefinition.NamedType namedType, String param)
             }
 
             if (typeStr.equals("bytes")) {
-                type = new DynamicBytes(param.getBytes());
+                byte[] bytes = ABICodecJsonWrapper.tryDecodeInputData(param);
+                if (bytes == null) {
+                    bytes = param.getBytes();
+                }
+                type = new DynamicBytes(bytes);
                 return type;
             }
 
@@ -239,7 +243,10 @@ private Type buildType(ABIDefinition.NamedType namedType, String param)
                     logger.error(errorMsg);
                     throw new ABICodecException(errorMsg);
                 }
-                byte[] bytesN = param.getBytes();
+                byte[] bytesN = ABICodecJsonWrapper.tryDecodeInputData(param);
+                if (bytesN == null) {
+                    bytesN = param.getBytes();
+                }
                 if (bytesN.length != length) {
                     String errorMsg =
                             String.format(
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/CommitteeInfo.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/CommitteeInfo.java
@@ -10,27 +10,6 @@
 public class CommitteeInfo {
     private final Logger logger = LoggerFactory.getLogger(CommitteeInfo.class);
 
-    class GovernorInfo {
-        String governorAddress;
-        BigInteger weight;
-
-        public GovernorInfo(String governorAddress, BigInteger weight) {
-            this.governorAddress = governorAddress;
-            this.weight = weight;
-        }
-
-        @Override
-        public String toString() {
-            return "GovernorInfo{"
-                    + "governorAddress='"
-                    + governorAddress
-                    + '\''
-                    + ", weight="
-                    + weight
-                    + '}';
-        }
-    }
-
     private List<GovernorInfo> governorList = new ArrayList<>();
     private int participatesRate;
     private int winRate;
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/GovernorInfo.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/GovernorInfo.java
@@ -0,0 +1,32 @@
+package org.fisco.bcos.sdk.contract.auth.po;
+
+import java.math.BigInteger;
+
+public class GovernorInfo {
+    private String governorAddress;
+    private BigInteger weight;
+
+    public String getGovernorAddress() {
+        return governorAddress;
+    }
+
+    public BigInteger getWeight() {
+        return weight;
+    }
+
+    public GovernorInfo(String governorAddress, BigInteger weight) {
+        this.governorAddress = governorAddress;
+        this.weight = weight;
+    }
+
+    @Override
+    public String toString() {
+        return "GovernorInfo{"
+                + "governorAddress='"
+                + governorAddress
+                + '\''
+                + ", weight="
+                + weight
+                + '}';
+    }
+}
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalInfo.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalInfo.java
@@ -46,6 +46,10 @@ public int getProposalType() {
         return proposalType;
     }
 
+    public String getProposalTypeString() {
+        return ProposalType.fromInt(proposalType).getValue();
+    }
+
     public void setProposalType(int proposalType) {
         this.proposalType = proposalType;
     }
@@ -62,6 +66,10 @@ public int getStatus() {
         return status;
     }
 
+    public String getStatusString() {
+        return ProposalStatus.fromInt(status).getValue();
+    }
+
     public void setStatus(int status) {
         this.status = status;
     }
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalStatus.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalStatus.java
@@ -17,7 +17,7 @@ public final String getValue() {
         return value;
     }
 
-    static ProposalStatus fromInt(int status) {
+    public static ProposalStatus fromInt(int status) {
         switch (status) {
             case 1:
                 return NOT_ENOUGH_VOTE;
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalType.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalType.java
@@ -18,7 +18,7 @@ public final String getValue() {
         return value;
     }
 
-    static ProposalType fromInt(int type) {
+    public static ProposalType fromInt(int type) {
         switch (type) {
             case 11:
                 return ProposalType.SET_WEIGHT;
diff --git a/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java b/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java
@@ -357,28 +357,56 @@ public void test7ComplexSetBytes() throws Exception {
         Assert.assertEquals(response.getTransactionReceipt().getStatus(), 0);
         String contractAddress = response.getContractAddress();
         // setBytes
-        List<String> paramsSetBytes = Lists.newArrayList(new String("123".getBytes()));
-        TransactionResponse transactionResponse3 =
-                transactionProcessor.sendTransactionWithStringParamsAndGetResponse(
-                        contractAddress, ABI, "setBytes", paramsSetBytes);
-        System.out.println(JsonUtils.toJson(transactionResponse3));
-        Assert.assertEquals(transactionResponse3.getResults().size(), 1);
+        {
+            List<String> paramsSetBytes = Lists.newArrayList(new String("123".getBytes()));
+            TransactionResponse transactionResponse3 =
+                    transactionProcessor.sendTransactionWithStringParamsAndGetResponse(
+                            contractAddress, ABI, "setBytes", paramsSetBytes);
+            System.out.println(JsonUtils.toJson(transactionResponse3));
+            Assert.assertEquals(transactionResponse3.getResults().size(), 1);
 
-        Map<String, List<List<Object>>> eventsMap3 = transactionResponse3.getEventResultMap();
-        System.out.println(JsonUtils.toJson(eventsMap3));
-        Assert.assertEquals(1, eventsMap3.size());
-        Assert.assertEquals("123", eventsMap3.get("LogSetBytes").get(0).get(1));
+            Map<String, List<List<Object>>> eventsMap3 = transactionResponse3.getEventResultMap();
+            System.out.println(JsonUtils.toJson(eventsMap3));
+            Assert.assertEquals(1, eventsMap3.size());
+            Assert.assertEquals("123", eventsMap3.get("LogSetBytes").get(0).get(1));
 
-        // getBytes
-        CallResponse callResponse4 =
-                transactionProcessor.sendCall(
-                        this.cryptoKeyPair.getAddress(),
-                        contractAddress,
-                        ABI,
-                        "_bytesV",
-                        Lists.newArrayList());
-        Assert.assertEquals(0, callResponse4.getReturnCode());
-        Assert.assertEquals(callResponse4.getResults().get(0), new DynamicBytes("123".getBytes()));
+            // getBytes
+            CallResponse callResponse4 =
+                    transactionProcessor.sendCall(
+                            this.cryptoKeyPair.getAddress(),
+                            contractAddress,
+                            ABI,
+                            "_bytesV",
+                            Lists.newArrayList());
+            Assert.assertEquals(0, callResponse4.getReturnCode());
+            Assert.assertEquals(
+                    callResponse4.getResults().get(0), new DynamicBytes("123".getBytes()));
+        }
+
+        // setBytes
+        {
+            List<String> paramsSetBytes2 =
+                    Lists.newArrayList(new String("hex://0x1234".getBytes()));
+            TransactionResponse transactionResponse4 =
+                    transactionProcessor.sendTransactionWithStringParamsAndGetResponse(
+                            contractAddress, ABI, "setBytes", paramsSetBytes2);
+            System.out.println(JsonUtils.toJson(transactionResponse4));
+            Assert.assertEquals(transactionResponse4.getResults().size(), 1);
+
+            Map<String, List<List<Object>>> eventsMap4 = transactionResponse4.getEventResultMap();
+            System.out.println(JsonUtils.toJson(eventsMap4));
+            Assert.assertEquals(1, eventsMap4.size());
+
+            // getBytes
+            CallResponse callResponse4 =
+                    transactionProcessor.sendCall(
+                            this.cryptoKeyPair.getAddress(),
+                            contractAddress,
+                            ABI,
+                            "_bytesV",
+                            Lists.newArrayList());
+            Assert.assertEquals(0, callResponse4.getReturnCode());
+        }
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@ public int getProposalType() {`
`46`	`46`	`return proposalType;`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ public String getProposalTypeString() {`
	`50`	`+ return ProposalType.fromInt(proposalType).getValue();`
	`51`	`+ }`
	`52`	`+`
`49`	`53`	`public void setProposalType(int proposalType) {`
`50`	`54`	`this.proposalType = proposalType;`
`51`	`55`	`}`
`@@ -62,6 +66,10 @@ public int getStatus() {`
`62`	`66`	`return status;`
`63`	`67`	`}`
`64`	`68`
	`69`	`+ public String getStatusString() {`
	`70`	`+ return ProposalStatus.fromInt(status).getValue();`
	`71`	`+ }`
	`72`	`+`
`65`	`73`	`public void setStatus(int status) {`
`66`	`74`	`this.status = status;`
`67`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public final String getValue() {`
`17`	`17`	`return value;`
`18`	`18`	`}`
`19`	`19`
`20`		`- static ProposalStatus fromInt(int status) {`
	`20`	`+ public static ProposalStatus fromInt(int status) {`
`21`	`21`	`switch (status) {`
`22`	`22`	`case 1:`
`23`	`23`	`return NOT_ENOUGH_VOTE;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public final String getValue() {`
`18`	`18`	`return value;`
`19`	`19`	`}`
`20`	`20`
`21`		`- static ProposalType fromInt(int type) {`
	`21`	`+ public static ProposalType fromInt(int type) {`
`22`	`22`	`switch (type) {`
`23`	`23`	`case 11:`
`24`	`24`	`return ProposalType.SET_WEIGHT;`