refactor

move TestPubKeyToAddress2 from lib/cgo/tests/check_cipher.crypto.c to lib/cgo/tests/check_cipher.crypto.common.c ref #34
fibercrypto · May 16, 2019 · df99fa2 · df99fa2
1 parent 80c1c02
commit df99fa2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/lib/cgo/tests/check_cipher.crypto.c b/lib/cgo/tests/check_cipher.crypto.c
@@ -59,34 +59,6 @@ START_TEST(TestPubKeyToAddress)
 }
 END_TEST
 
-START_TEST(TestPubKeyToAddress2)
-{
-    cipher__PubKey p;
-    cipher__SecKey s;
-    cipher__Address addr;
-    GoString_ addrStr;
-    int i;
-    GoUint32 errorcode;
-
-    for (i = 0; i < 1024; i++) {
-        SKY_cipher_GenerateKeyPair(&p, &s);
-        SKY_cipher_AddressFromPubKey(&p, &addr);
-        //func (self Address) Verify(key PubKey) error
-        errorcode = SKY_cipher_Address_Verify(&addr, &p);
-        ck_assert(errorcode == SKY_OK);
-        SKY_cipher_Address_String(&addr, &addrStr);
-        unsigned char buff[50];
-        GoString addrStr_tmp = {buff, 0};
-        addrStr_tmp.p = addrStr.p;
-        addrStr_tmp.n = addrStr.n;
-        registerMemCleanup((void*)addrStr.p);
-        errorcode = SKY_cipher_DecodeBase58Address(addrStr_tmp, &addr);
-        //func DecodeBase58Address(addr string) (Address, error)
-        ck_assert(errorcode == SKY_OK);
-    }
-}
-END_TEST
-
 START_TEST(TestSecKeyFromHex)
 {
     unsigned char buff[50];
@@ -698,7 +670,6 @@ Suite* cipher_crypto(void)
     tc = tcase_create("cipher.crypto");
     tcase_add_checked_fixture(tc, setup, teardown);
     tcase_add_test(tc, TestPubKeyRipemd160);
-    tcase_add_test(tc, TestPubKeyToAddress2);
     tcase_add_test(tc, TestSecKeyFromHex);
     tcase_add_test(tc, TestMustSecKeyFromHex);
     tcase_add_test(tc, TestSecKeyVerify);

diff --git a/lib/cgo/tests/check_cipher.crypto.common.c b/lib/cgo/tests/check_cipher.crypto.common.c
@@ -169,6 +169,34 @@ START_TEST(TestPubKeyVerifyDefault1)
 }
 END_TEST
 
+START_TEST(TestPubKeyToAddress2)
+{
+    cipher__PubKey p;
+    cipher__SecKey s;
+    cipher__Address addr;
+    GoString_ addrStr;
+    int i;
+    GoUint32 errorcode;
+
+    for (i = 0; i < 1024; i++) {
+        SKY_cipher_GenerateKeyPair(&p, &s);
+        SKY_cipher_AddressFromPubKey(&p, &addr);
+        //func (self Address) Verify(key PubKey) error
+        errorcode = SKY_cipher_Address_Verify(&addr, &p);
+        ck_assert(errorcode == SKY_OK);
+        SKY_cipher_Address_String(&addr, &addrStr);
+        unsigned char buff[50];
+        GoString addrStr_tmp = {buff, 0};
+        addrStr_tmp.p = addrStr.p;
+        addrStr_tmp.n = addrStr.n;
+        registerMemCleanup((void*)addrStr.p);
+        errorcode = SKY_cipher_DecodeBase58Address(addrStr_tmp, &addr);
+        //func DecodeBase58Address(addr string) (Address, error)
+        ck_assert(errorcode == SKY_OK);
+    }
+}
+END_TEST
+
 // define test suite and cases
 Suite *common_check_cipher_crypto(void)
 {
@@ -182,6 +210,7 @@ Suite *common_check_cipher_crypto(void)
   tcase_add_test(tc, TestPubKeyVerify);
   tcase_add_test(tc, TestPubKeyVerifyNil);
   tcase_add_test(tc, TestPubKeyVerifyDefault1);
+  tcase_add_test(tc, TestPubKeyToAddress2);
   suite_add_tcase(s, tc);
   tcase_set_timeout(tc, 150);