rename related func name

Mojicode · Mojicode · commit 98772ef8c3f2 · 2024-03-13T11:15:43.000+08:00
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/crypto/CryptoSuite.java b/src/main/java/org/fisco/bcos/sdk/v3/crypto/CryptoSuite.java
@@ -313,8 +313,8 @@ public boolean verify(final String publicKey, final byte[] message, final byte[]
      * @param signature the signature to be recovered
      * @return the public key whitch can verify signature.
      */
-    public String ecrecover(final String msgHash, final SignatureResult signature) {
-        return this.signatureImpl.ecrecover(msgHash, signature);
+    public String recoverAddress(final String msgHash, final SignatureResult signature) {
+        return this.signatureImpl.recoverAddress(msgHash, signature);
     }
 
     /**
@@ -324,8 +324,8 @@ public String ecrecover(final String msgHash, final SignatureResult signature) {
      * @param signature the byte array type signature to be recovered
      * @return the public key whitch can verify signature.
      */
-    public String ecrecover(final byte[] msgHash, final SignatureResult signature) {
-        return this.signatureImpl.ecrecover(msgHash, signature);
+    public String recoverAddress(final byte[] msgHash, final SignatureResult signature) {
+        return this.signatureImpl.recoverAddress(msgHash, signature);
     }
 
     /**
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/ECDSASignature.java b/src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/ECDSASignature.java
@@ -91,13 +91,13 @@ public static boolean verifyMessage(String publicKey, String message, String sig
     }
 
     @Override
-    public String ecrecover(final String msgHash, final SignatureResult signature) {
+    public String recoverAddress(final String msgHash, final SignatureResult signature) {
         return ecrecoverSignature(msgHash, signature);
     }
 
     @Override
-    public String ecrecover(final byte[] msgHash, final SignatureResult signature) {
-        return ecrecover(Hex.toHexString(msgHash), signature);
+    public String recoverAddress(final byte[] msgHash, final SignatureResult signature) {
+        return recoverAddress(Hex.toHexString(msgHash), signature);
     }
 
     public static String ecrecoverSignature(String msgHash, SignatureResult signature) {
@@ -106,13 +106,13 @@ public static String ecrecoverSignature(String msgHash, SignatureResult signatur
     }
 
     @Override
-    public String getPubFromSig(final String msgHash, final SignatureResult signature) {
+    public String recoverPublicKey(final String msgHash, final SignatureResult signature) {
         return getPubFromSignature(msgHash, signature);
     }
 
     @Override
-    public String getPubFromSig(final byte[] msgHash, final SignatureResult signature) {
-        return getPubFromSig(Hex.toHexString(msgHash), signature);
+    public String recoverPublicKey(final byte[] msgHash, final SignatureResult signature) {
+        return recoverPublicKey(Hex.toHexString(msgHash), signature);
     }
 
     public static String getPubFromSignature(String msgHash, SignatureResult signature) {
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/HsmSM2Signature.java b/src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/HsmSM2Signature.java
@@ -99,28 +99,28 @@ public boolean verifyMessage(String publicKey, String message, String signature)
     }
 
     @Override
-    public String ecrecover(final String msgHash, final SignatureResult signature) {
+    public String recoverAddress(final String msgHash, final SignatureResult signature) {
         return ecrecoverSignature(msgHash, signature);
     }
 
     @Override
-    public String ecrecover(final byte[] msgHash, final SignatureResult signature) {
-        return ecrecover(Hex.toHexString(msgHash), signature);
+    public String recoverAddress(final byte[] msgHash, final SignatureResult signature) {
+        return recoverAddress(Hex.toHexString(msgHash), signature);
     }
 
     public static String ecrecoverSignature(String msgHash, SignatureResult signature) {
-        String publicKey = getPubFromSignature(msgHash, signature);
+        // String publicKey = getPubFromSignature(msgHash, signature);
         return "";
     }
 
     @Override
-    public String getPubFromSig(final String msgHash, final SignatureResult signature) {
+    public String recoverPublicKey(final String msgHash, final SignatureResult signature) {
         return getPubFromSignature(msgHash, signature);
     }
 
     @Override
-    public String getPubFromSig(final byte[] msgHash, final SignatureResult signature) {
-        return getPubFromSig(Hex.toHexString(msgHash), signature);
+    public String recoverPublicKey(final byte[] msgHash, final SignatureResult signature) {
+        return recoverPublicKey(Hex.toHexString(msgHash), signature);
     }
 
     public static String getPubFromSignature(String msgHash, SignatureResult signature) {
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/SM2Signature.java b/src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/SM2Signature.java
@@ -77,13 +77,13 @@ public static boolean verifyMessage(String publicKey, String message, String sig
     }
 
     @Override
-    public String ecrecover(final String msgHash, final SignatureResult signature) {
+    public String recoverAddress(final String msgHash, final SignatureResult signature) {
         return ecrecoverSignature(msgHash, signature);
     }
 
     @Override
-    public String ecrecover(final byte[] msgHash, final SignatureResult signature) {
-        return ecrecover(Hex.toHexString(msgHash), signature);
+    public String recoverAddress(final byte[] msgHash, final SignatureResult signature) {
+        return recoverAddress(Hex.toHexString(msgHash), signature);
     }
 
     public static String ecrecoverSignature(String msgHash, SignatureResult signature) {
@@ -92,13 +92,13 @@ public static String ecrecoverSignature(String msgHash, SignatureResult signatur
     }
 
     @Override
-    public String getPubFromSig(final String msgHash, final SignatureResult signature) {
+    public String recoverPublicKey(final String msgHash, final SignatureResult signature) {
         return getPubFromSignature(msgHash, signature);
     }
 
     @Override
-    public String getPubFromSig(final byte[] msgHash, final SignatureResult signature) {
-        return getPubFromSig(Hex.toHexString(msgHash), signature);
+    public String recoverPublicKey(final byte[] msgHash, final SignatureResult signature) {
+        return recoverPublicKey(Hex.toHexString(msgHash), signature);
     }
 
     public static String getPubFromSignature(String msgHash, SignatureResult signature) {
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/Signature.java b/src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/Signature.java
@@ -72,7 +72,7 @@ public interface Signature {
      * @param signature the signature to be recovered
      * @return the address who sign the msgHash.
      */
-    String ecrecover(final String msgHash, final SignatureResult signature);
+    String recoverAddress(final String msgHash, final SignatureResult signature);
 
     /**
      * recover address from signature
@@ -81,7 +81,7 @@ public interface Signature {
      * @param signature the byte array type signature to be recovered
      * @return the address who sign the msgHash.
      */
-    String ecrecover(final byte[] msgHash, final SignatureResult signature);
+    String recoverAddress(final byte[] msgHash, final SignatureResult signature);
 
     /**
      * recover public from signature
@@ -90,7 +90,7 @@ public interface Signature {
      * @param signature the signature to be recovered
      * @return the public key which can verify signature.
      */
-    String getPubFromSig(final String msgHash, final SignatureResult signature);
+    String recoverPublicKey(final String msgHash, final SignatureResult signature);
 
     /**
      * recover address from signature
@@ -99,5 +99,5 @@ public interface Signature {
      * @param signature the byte array type signature to be recovered
      * @return the public key which can verify signature.
      */
-    String getPubFromSig(final byte[] msgHash, final SignatureResult signature);
+    String recoverPublicKey(final byte[] msgHash, final SignatureResult signature);
 }
diff --git a/src/test/java/org/fisco/bcos/sdk/v3/test/crypto/SignatureTest.java b/src/test/java/org/fisco/bcos/sdk/v3/test/crypto/SignatureTest.java
@@ -366,7 +366,7 @@ public void testECDSASignature(CryptoSuite cryptoSuite, CryptoKeyPair keyPair) {
             // sign
             ECDSASignatureResult signatureResult = (ECDSASignatureResult) cryptoSuite.sign(message, keyPair);
             //ecrecover
-            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.ecrecover(message, signatureResult));
+            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.recoverAddress(message, signatureResult));
             // verify
             Assert.assertTrue(
                     cryptoSuite.verify(
@@ -378,7 +378,7 @@ public void testECDSASignature(CryptoSuite cryptoSuite, CryptoKeyPair keyPair) {
 
             // new sign
             ECDSASignatureResult newSign = new ECDSASignatureResult(signatureResult.getV(), signatureResult.getR(), signatureResult.getS());
-            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.ecrecover(message, newSign));
+            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.recoverAddress(message, newSign));
             Assert.assertTrue(
                     cryptoSuite.verify(
                             keyPair.getHexPublicKey(), message, newSign.convertToString()));
@@ -422,7 +422,7 @@ public void testSMSignature(CryptoSuite cryptoSuite, CryptoKeyPair keyPair) {
             // sign
             SM2SignatureResult signatureResult = (SM2SignatureResult) cryptoSuite.sign(message, keyPair);
             //ecrecover
-            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.ecrecover(message, signatureResult));
+            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.recoverAddress(message, signatureResult));
             // verify
             Assert.assertTrue(
                     cryptoSuite.verify(
@@ -434,7 +434,7 @@ public void testSMSignature(CryptoSuite cryptoSuite, CryptoKeyPair keyPair) {
 
             // new sign
             SM2SignatureResult newSign = new SM2SignatureResult(signatureResult.getPub(), signatureResult.getR(), signatureResult.getS());
-            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.ecrecover(message, newSign));
+            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.recoverAddress(message, newSign));
             Assert.assertTrue(
                     cryptoSuite.verify(
                             keyPair.getHexPublicKey(), message, newSign.convertToString()));

Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,13 @@ public static boolean verifyMessage(String publicKey, String message, String sig`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`
`94`		`- public String ecrecover(final String msgHash, final SignatureResult signature) {`
	`94`	`+ public String recoverAddress(final String msgHash, final SignatureResult signature) {`
`95`	`95`	`return ecrecoverSignature(msgHash, signature);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Override`
`99`		`- public String ecrecover(final byte[] msgHash, final SignatureResult signature) {`
`100`		`- return ecrecover(Hex.toHexString(msgHash), signature);`
	`99`	`+ public String recoverAddress(final byte[] msgHash, final SignatureResult signature) {`
	`100`	`+ return recoverAddress(Hex.toHexString(msgHash), signature);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`public static String ecrecoverSignature(String msgHash, SignatureResult signature) {`
`@@ -106,13 +106,13 @@ public static String ecrecoverSignature(String msgHash, SignatureResult signatur`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@Override`
`109`		`- public String getPubFromSig(final String msgHash, final SignatureResult signature) {`
	`109`	`+ public String recoverPublicKey(final String msgHash, final SignatureResult signature) {`
`110`	`110`	`return getPubFromSignature(msgHash, signature);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`@Override`
`114`		`- public String getPubFromSig(final byte[] msgHash, final SignatureResult signature) {`
`115`		`- return getPubFromSig(Hex.toHexString(msgHash), signature);`
	`114`	`+ public String recoverPublicKey(final byte[] msgHash, final SignatureResult signature) {`
	`115`	`+ return recoverPublicKey(Hex.toHexString(msgHash), signature);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`public static String getPubFromSignature(String msgHash, SignatureResult signature) {`
Original file line number	Diff line number	Diff line change
`@@ -99,28 +99,28 @@ public boolean verifyMessage(String publicKey, String message, String signature)`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`@Override`
`102`		`- public String ecrecover(final String msgHash, final SignatureResult signature) {`
	`102`	`+ public String recoverAddress(final String msgHash, final SignatureResult signature) {`
`103`	`103`	`return ecrecoverSignature(msgHash, signature);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`@Override`
`107`		`- public String ecrecover(final byte[] msgHash, final SignatureResult signature) {`
`108`		`- return ecrecover(Hex.toHexString(msgHash), signature);`
	`107`	`+ public String recoverAddress(final byte[] msgHash, final SignatureResult signature) {`
	`108`	`+ return recoverAddress(Hex.toHexString(msgHash), signature);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public static String ecrecoverSignature(String msgHash, SignatureResult signature) {`
`112`		`- String publicKey = getPubFromSignature(msgHash, signature);`
	`112`	`+ // String publicKey = getPubFromSignature(msgHash, signature);`
`113`	`113`	`return "";`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`@Override`
`117`		`- public String getPubFromSig(final String msgHash, final SignatureResult signature) {`
	`117`	`+ public String recoverPublicKey(final String msgHash, final SignatureResult signature) {`
`118`	`118`	`return getPubFromSignature(msgHash, signature);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`@Override`
`122`		`- public String getPubFromSig(final byte[] msgHash, final SignatureResult signature) {`
`123`		`- return getPubFromSig(Hex.toHexString(msgHash), signature);`
	`122`	`+ public String recoverPublicKey(final byte[] msgHash, final SignatureResult signature) {`
	`123`	`+ return recoverPublicKey(Hex.toHexString(msgHash), signature);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`public static String getPubFromSignature(String msgHash, SignatureResult signature) {`
Original file line number	Diff line number	Diff line change
`@@ -77,13 +77,13 @@ public static boolean verifyMessage(String publicKey, String message, String sig`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@Override`
`80`		`- public String ecrecover(final String msgHash, final SignatureResult signature) {`
	`80`	`+ public String recoverAddress(final String msgHash, final SignatureResult signature) {`
`81`	`81`	`return ecrecoverSignature(msgHash, signature);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Override`
`85`		`- public String ecrecover(final byte[] msgHash, final SignatureResult signature) {`
`86`		`- return ecrecover(Hex.toHexString(msgHash), signature);`
	`85`	`+ public String recoverAddress(final byte[] msgHash, final SignatureResult signature) {`
	`86`	`+ return recoverAddress(Hex.toHexString(msgHash), signature);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public static String ecrecoverSignature(String msgHash, SignatureResult signature) {`
`@@ -92,13 +92,13 @@ public static String ecrecoverSignature(String msgHash, SignatureResult signatur`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
`95`		`- public String getPubFromSig(final String msgHash, final SignatureResult signature) {`
	`95`	`+ public String recoverPublicKey(final String msgHash, final SignatureResult signature) {`
`96`	`96`	`return getPubFromSignature(msgHash, signature);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`@Override`
`100`		`- public String getPubFromSig(final byte[] msgHash, final SignatureResult signature) {`
`101`		`- return getPubFromSig(Hex.toHexString(msgHash), signature);`
	`100`	`+ public String recoverPublicKey(final byte[] msgHash, final SignatureResult signature) {`
	`101`	`+ return recoverPublicKey(Hex.toHexString(msgHash), signature);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`public static String getPubFromSignature(String msgHash, SignatureResult signature) {`