Replace DynamicLinking to DynamicLibrary in ckb-auth-rs

nervosnetwork · Dec 13, 2023 · d5aa298 · d5aa298
1 parent f7391c1
commit d5aa298
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/ckb-auth-rs/src/ckb_auth.rs b/ckb-auth-rs/src/ckb_auth.rs
@@ -23,7 +23,7 @@ pub fn ckb_auth(
     match entry.entry_category {
         EntryCategoryType::Exec => ckb_auth_exec(entry, id, signature, message),
         #[cfg(feature = "enable-dynamic-library")]
-        EntryCategoryType::DynamicLinking => ckb_auth_dl(entry, id, signature, message),
+        EntryCategoryType::DynamicLibrary => ckb_auth_dl(entry, id, signature, message),
         #[cfg(feature = "ckb2023")]
         EntryCategoryType::Spawn => ckb_auth_spawn(entry, id, signature, message),
     }

diff --git a/ckb-auth-rs/src/lib.rs b/ckb-auth-rs/src/lib.rs
@@ -99,7 +99,7 @@ impl From<NulError> for CkbAuthError {
 pub enum EntryCategoryType {
     Exec = 0,
     #[cfg(feature = "enable-dynamic-library")]
-    DynamicLinking = 1,
+    DynamicLibrary = 1,
     #[cfg(feature = "ckb2023")]
     Spawn = 2,
 }
@@ -110,7 +110,7 @@ impl TryFrom<u8> for EntryCategoryType {
         match value {
             0 => Ok(Self::Exec),
             #[cfg(feature = "enable-dynamic-library")]
-            1 => Ok(Self::DynamicLinking),
+            1 => Ok(Self::DynamicLibrary),
             #[cfg(feature = "ckb2023")]
             2 => Ok(Self::Spawn),
             _ => Err(CkbAuthError::EncodeArgs),

diff --git a/tests/auth-c-tests/src/tests/mod.rs b/tests/auth-c-tests/src/tests/mod.rs
@@ -176,14 +176,14 @@ fn unit_test_common_with_runtype(
 
 fn unit_test_common_all_runtype(auth: &Box<dyn Auth>) {
     unit_test_common_with_auth(auth, EntryCategoryType::Exec);
-    unit_test_common_with_auth(auth, EntryCategoryType::DynamicLinking);
+    unit_test_common_with_auth(auth, EntryCategoryType::DynamicLibrary);
     unit_test_common_with_auth(auth, EntryCategoryType::Spawn);
 }
 
 fn unit_test_common(algorithm_type: AuthAlgorithmIdType) {
     for t in [
         EntryCategoryType::Exec,
-        EntryCategoryType::DynamicLinking,
+        EntryCategoryType::DynamicLibrary,
         EntryCategoryType::Spawn,
     ] {
         unit_test_common_with_runtype(algorithm_type.clone(), t, false);
@@ -193,7 +193,7 @@ fn unit_test_common(algorithm_type: AuthAlgorithmIdType) {
 fn unit_test_common_official(algorithm_type: AuthAlgorithmIdType) {
     for t in [
         EntryCategoryType::Exec,
-        EntryCategoryType::DynamicLinking,
+        EntryCategoryType::DynamicLibrary,
         EntryCategoryType::Spawn,
     ] {
         unit_test_common_with_runtype(algorithm_type.clone(), t, true);
@@ -284,7 +284,7 @@ fn bitcoin_pubkey_recid_verify() {
         0: BitcoinAuth::default(),
     });
 
-    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLinking, 1);
+    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLibrary, 1);
     assert_result_error(
         verify_unit(&config),
         "failed conver btc",
@@ -375,7 +375,7 @@ fn convert_eth_error() {
         },
     });
 
-    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLinking, 1);
+    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLibrary, 1);
     assert_result_error(
         verify_unit(&config),
         "failed conver eth",
@@ -413,7 +413,7 @@ fn convert_tron_error() {
     let auth: Box<dyn Auth> = Box::new(TronConverFaileAuth {
         0: TronAuth { privkey, pubkey },
     });
-    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLinking, 1);
+    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLibrary, 1);
     assert_result_error(
         verify_unit(&config),
         "failed conver tron",
@@ -455,7 +455,7 @@ fn convert_btc_error() {
         0: BitcoinAuth::default(),
     });
 
-    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLinking, 1);
+    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLibrary, 1);
     assert_result_error(
         verify_unit(&config),
         "failed conver btc",
@@ -502,7 +502,7 @@ fn convert_doge_error() {
         },
     });
 
-    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLinking, 1);
+    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLibrary, 1);
     assert_result_error(
         verify_unit(&config),
         "failed conver doge",
@@ -550,7 +550,7 @@ fn convert_lite_error() {
         },
     });
 
-    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLinking, 1);
+    let config = TestConfig::new(&auth, EntryCategoryType::DynamicLibrary, 1);
     assert_result_error(
         verify_unit(&config),
         "failed conver lite",
@@ -671,7 +671,7 @@ fn unit_test_ckbmultisig(auth: &Box<dyn Auth>, run_type: EntryCategoryType) {
 fn ckbmultisig_verify() {
     let auth: Box<dyn Auth> = CkbMultisigAuth::new(2, 2, 1);
     unit_test_ckbmultisig(&auth, EntryCategoryType::Exec);
-    unit_test_ckbmultisig(&auth, EntryCategoryType::DynamicLinking);
+    unit_test_ckbmultisig(&auth, EntryCategoryType::DynamicLibrary);
     unit_test_ckbmultisig(&auth, EntryCategoryType::Spawn);
 }
 
@@ -709,7 +709,7 @@ fn abnormal_algorithm_type() {
         );
     }
     {
-        let config = TestConfig::new(&auth, EntryCategoryType::DynamicLinking, 1);
+        let config = TestConfig::new(&auth, EntryCategoryType::DynamicLibrary, 1);
         assert_result_error(
             verify_unit(&config),
             "sign size(smaller)",

diff --git a/tests/auth-rust-lock/tests/src/tests.rs b/tests/auth-rust-lock/tests/src/tests.rs
@@ -218,7 +218,7 @@ fn test_dll() {
     let tx = gen_tx(
         &mut ctx,
         vec![(
-            auth.get_auth_args(&EntryCategoryType::DynamicLinking),
+            auth.get_auth_args(&EntryCategoryType::DynamicLibrary),
             CKB_SIGN_GROUP_SIZE,
         )],
     );