<fix>(contract): rename ContractWrapper to FunctionWrapper to avoid d…

…uplicate name. (#901)
FISCO-BCOS · Mar 12, 2024 · 2bba82c · 2bba82c
1 parent e1a3eae
commit 2bba82c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/contract/Contract.java b/src/main/java/org/fisco/bcos/sdk/v3/contract/Contract.java
@@ -564,23 +564,23 @@ protected String asyncExecuteTransaction(Function function, TransactionCallback
     }
 
     protected String asyncExecuteTransaction(
-            ContractWrapper contractWrapper, TransactionCallback callback) {
+            FunctionWrapper functionWrapper, TransactionCallback callback) {
         try {
             TransactionManager txManager = this.transactionManager;
             if (txManager == null) {
                 txManager = new DefaultTransactionManager(client);
             }
             AbiEncodedRequest abiEncodedRequest =
                     new TransactionRequestBuilder()
-                            .setNonce(contractWrapper.getNonce())
-                            .setBlockLimit(contractWrapper.getBlockLimit())
-                            .setExtension(contractWrapper.getExtension())
+                            .setNonce(functionWrapper.getNonce())
+                            .setBlockLimit(functionWrapper.getBlockLimit())
+                            .setExtension(functionWrapper.getExtension())
                             .setValue(
-                                    contractWrapper.getValue() != null
-                                            ? contractWrapper.getValue().toBigIntegerExact()
+                                    functionWrapper.getValue() != null
+                                            ? functionWrapper.getValue().toBigIntegerExact()
                                             : null)
                             .buildAbiEncodedRequest(
-                                    this.functionEncoder.encode(contractWrapper.getFunction()));
+                                    this.functionEncoder.encode(functionWrapper.getFunction()));
             return txManager.asyncSendTransaction(abiEncodedRequest, callback);
         } catch (JniException | ContractException e) {
             logger.error("sendTransaction failed, error info: {}", e.getMessage(), e);
@@ -614,7 +614,7 @@ protected TransactionReceipt executeTransaction(Function function) {
                 txAttribute);
     }
 
-    protected TransactionReceipt executeTransaction(ContractWrapper contractWrapper) {
+    protected TransactionReceipt executeTransaction(FunctionWrapper functionWrapper) {
         TransactionManager txManager = this.transactionManager;
         if (txManager == null) {
             txManager = new DefaultTransactionManager(client);
@@ -623,15 +623,15 @@ protected TransactionReceipt executeTransaction(ContractWrapper contractWrapper)
         try {
             AbiEncodedRequest abiEncodedRequest =
                     new TransactionRequestBuilder()
-                            .setNonce(contractWrapper.getNonce())
-                            .setBlockLimit(contractWrapper.getBlockLimit())
-                            .setExtension(contractWrapper.getExtension())
+                            .setNonce(functionWrapper.getNonce())
+                            .setBlockLimit(functionWrapper.getBlockLimit())
+                            .setExtension(functionWrapper.getExtension())
                             .setValue(
-                                    contractWrapper.getValue() != null
-                                            ? contractWrapper.getValue().toBigIntegerExact()
+                                    functionWrapper.getValue() != null
+                                            ? functionWrapper.getValue().toBigIntegerExact()
                                             : null)
                             .buildAbiEncodedRequest(
-                                    this.functionEncoder.encode(contractWrapper.getFunction()));
+                                    this.functionEncoder.encode(functionWrapper.getFunction()));
             transactionReceipt = txManager.sendTransaction(abiEncodedRequest);
         } catch (JniException | ContractException e) {
             logger.error("sendTransaction failed, error info: {}", e.getMessage(), e);

diff --git a/...bcos/sdk/v3/contract/ContractWrapper.java → ...bcos/sdk/v3/contract/FunctionWrapper.java b/...bcos/sdk/v3/contract/ContractWrapper.java → ...bcos/sdk/v3/contract/FunctionWrapper.java
@@ -6,19 +6,19 @@
 import org.fisco.bcos.sdk.v3.model.TransactionReceipt;
 import org.fisco.bcos.sdk.v3.model.callback.TransactionCallback;
 
-public class ContractWrapper {
+public class FunctionWrapper {
     private final Contract contract;
     private Function function;
     private String nonce;
     private BigInteger blockLimit;
     private BigDecimal value;
     private byte[] extension;
 
-    public ContractWrapper(Contract contract) {
+    public FunctionWrapper(Contract contract) {
         this.contract = contract;
     }
 
-    public ContractWrapper(Contract contract, Function function) {
+    public FunctionWrapper(Contract contract, Function function) {
         this.contract = contract;
         this.function = function;
     }
@@ -27,7 +27,7 @@ public Function getFunction() {
         return function;
     }
 
-    public ContractWrapper setFunction(Function function) {
+    public FunctionWrapper setFunction(Function function) {
         this.function = function;
         return this;
     }
@@ -36,7 +36,7 @@ public String getNonce() {
         return nonce;
     }
 
-    public ContractWrapper setNonce(String nonce) {
+    public FunctionWrapper setNonce(String nonce) {
         this.nonce = nonce;
         return this;
     }
@@ -45,7 +45,7 @@ public BigInteger getBlockLimit() {
         return blockLimit;
     }
 
-    public ContractWrapper setBlockLimit(BigInteger blockLimit) {
+    public FunctionWrapper setBlockLimit(BigInteger blockLimit) {
         this.blockLimit = blockLimit;
         return this;
     }
@@ -54,7 +54,7 @@ public BigDecimal getValue() {
         return value;
     }
 
-    public ContractWrapper setValue(BigDecimal value) {
+    public FunctionWrapper setValue(BigDecimal value) {
         this.value = value;
         return this;
     }
@@ -63,7 +63,7 @@ public byte[] getExtension() {
         return extension;
     }
 
-    public ContractWrapper setExtension(byte[] extension) {
+    public FunctionWrapper setExtension(byte[] extension) {
         this.extension = extension;
         return this;
     }