fix test failed and googleJavaFormat

Author: Mojicode

src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/ECDSASignature.java

@@ -116,7 +116,8 @@ public String getPubFromSig(final byte[] msgHash, final SignatureResult signatur
     }
 
     public static String getPubFromSignature(String msgHash, SignatureResult signature) {
-        CryptoResult verifyResult = NativeInterface.secp256k1RecoverPublicKey(msgHash, signature.toString());
+        CryptoResult verifyResult =
+                NativeInterface.secp256k1RecoverPublicKey(msgHash, signature.toString());
         if (verifyResult.wedprErrorMessage != null && !verifyResult.wedprErrorMessage.isEmpty()) {
             throw new SignatureException(
                     "Recover public key failed:" + verifyResult.wedprErrorMessage);

src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/HsmSM2Signature.java

@@ -18,7 +18,6 @@
 import org.fisco.bcos.sdk.v3.crypto.exceptions.SignatureException;
 import org.fisco.bcos.sdk.v3.crypto.keypair.CryptoKeyPair;
 import org.fisco.bcos.sdk.v3.crypto.keypair.HsmSM2KeyPair;
-import org.fisco.bcos.sdk.v3.crypto.keypair.SM2KeyPair;
 import org.fisco.bcos.sdk.v3.model.CryptoType;
 import org.fisco.bcos.sdk.v3.utils.Hex;
 import org.fisco.bcos.sdk.v3.utils.Numeric;

src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/SM2Signature.java

@@ -17,7 +17,6 @@
 import com.webank.wedpr.crypto.NativeInterface;
 import org.fisco.bcos.sdk.v3.crypto.exceptions.SignatureException;
 import org.fisco.bcos.sdk.v3.crypto.keypair.CryptoKeyPair;
-import org.fisco.bcos.sdk.v3.crypto.keypair.ECDSAKeyPair;
 import org.fisco.bcos.sdk.v3.crypto.keypair.SM2KeyPair;
 import org.fisco.bcos.sdk.v3.utils.Hex;
 import org.fisco.bcos.sdk.v3.utils.Numeric;

src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/SignatureResult.java

@@ -61,7 +61,7 @@ public byte[] getS() {
     }
 
     public byte[] getPub() {
-        return new byte[]{};
+        return new byte[] {};
     }
 
     public byte[] getSignatureBytes() {

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.getHexPublicKey(), cryptoSuite.ecrecover(message, signatureResult));
+            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.ecrecover(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.getHexPublicKey(), cryptoSuite.ecrecover(message, newSign));
+            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.ecrecover(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.getHexPublicKey(), cryptoSuite.ecrecover(message, signatureResult));
+            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.ecrecover(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.getHexPublicKey(), cryptoSuite.ecrecover(message, newSign));
+            Assert.assertEquals(keyPair.getAddress(), cryptoSuite.ecrecover(message, newSign));
             Assert.assertTrue(
                     cryptoSuite.verify(
                             keyPair.getHexPublicKey(), message, newSign.convertToString()));