Merge pull request #168 from aptos-labs/j/rename-package2

rename package name and module name
aptos-labs · Sep 22, 2023 · e18060b · e18060b
2 parents 75450cf + 9b0ba1e
commit e18060b
Show file tree

Hide file tree

Showing 27 changed files with 2,444 additions and 2,445 deletions.
diff --git a/bulk/sources/bulk_tests.move b/bulk/sources/bulk_tests.move
@@ -15,7 +15,7 @@ module bulk::bulk_tests {
     #[test(
         router = @router,
         aptos_names = @aptos_names,
-        aptos_names_v2 = @aptos_names_v2,
+        aptos_names_v2_1 = @aptos_names_v2_1,
         user1 = @0x077,
         user2 = @0x266f,
         aptos = @0x1,
@@ -24,14 +24,14 @@ module bulk::bulk_tests {
     fun test_bulk_migrate_happy_path(
         router: &signer,
         aptos_names: &signer,
-        aptos_names_v2: &signer,
+        aptos_names_v2_1: &signer,
         user1: signer,
         user2: signer,
         aptos: signer,
         foundation: signer
     ) {
         router::init_module_for_test(router);
-        let users = router_test_helper::e2e_test_setup(aptos_names, aptos_names_v2, user1, &aptos, user2, &foundation);
+        let users = router_test_helper::e2e_test_setup(aptos_names, aptos_names_v2_1, user1, &aptos, user2, &foundation);
         let user1 = vector::borrow(&users, 0);
         let user1_addr = signer::address_of(user1);
         let domain_name1 = utf8(b"test1");
@@ -99,35 +99,35 @@ module bulk::bulk_tests {
         // Verify names exist in v2 now
         {
             assert!(
-                aptos_names_v2::v2_domains::is_token_owner(
+                aptos_names_v2_1::v2_1_domains::is_token_owner(
                     user1_addr,
                     domain_name1,
                     option::none()
-                ) && !aptos_names_v2::v2_domains::is_name_expired(domain_name1, option::none()),
+                ) && !aptos_names_v2_1::v2_1_domains::is_name_expired(domain_name1, option::none()),
                 3
             );
             assert!(
-                aptos_names_v2::v2_domains::is_token_owner(
+                aptos_names_v2_1::v2_1_domains::is_token_owner(
                     user1_addr,
                     domain_name1,
                     subdomain_name_opt,
-                ) && !aptos_names_v2::v2_domains::is_name_expired(domain_name1, subdomain_name_opt),
+                ) && !aptos_names_v2_1::v2_1_domains::is_name_expired(domain_name1, subdomain_name_opt),
                 4
             );
             assert!(
-                aptos_names_v2::v2_domains::is_token_owner(
+                aptos_names_v2_1::v2_1_domains::is_token_owner(
                     user1_addr,
                     domain_name2,
                     option::none()
-                ) && !aptos_names_v2::v2_domains::is_name_expired(domain_name2, option::none()),
+                ) && !aptos_names_v2_1::v2_1_domains::is_name_expired(domain_name2, option::none()),
                 3
             );
             assert!(
-                aptos_names_v2::v2_domains::is_token_owner(
+                aptos_names_v2_1::v2_1_domains::is_token_owner(
                     user1_addr,
                     domain_name2,
                     subdomain_name_opt,
-                ) && !aptos_names_v2::v2_domains::is_name_expired(domain_name2, subdomain_name_opt),
+                ) && !aptos_names_v2_1::v2_1_domains::is_name_expired(domain_name2, subdomain_name_opt),
                 4
             );
         }
@@ -136,7 +136,7 @@ module bulk::bulk_tests {
     #[test(
         router = @router,
         aptos_names = @aptos_names,
-        aptos_names_v2 = @aptos_names_v2,
+        aptos_names_v2_1 = @aptos_names_v2_1,
         user1 = @0x077,
         user2 = @0x266f,
         aptos = @0x1,
@@ -145,14 +145,14 @@ module bulk::bulk_tests {
     fun test_bulk_renew_happy_path(
         router: &signer,
         aptos_names: &signer,
-        aptos_names_v2: &signer,
+        aptos_names_v2_1: &signer,
         user1: signer,
         user2: signer,
         aptos: signer,
         foundation: signer
     ) {
         router::init_module_for_test(router);
-        let users = router_test_helper::e2e_test_setup(aptos_names, aptos_names_v2, user1, &aptos, user2, &foundation);
+        let users = router_test_helper::e2e_test_setup(aptos_names, aptos_names_v2_1, user1, &aptos, user2, &foundation);
         let user1 = vector::borrow(&users, 0);
         let domain_name = utf8(b"test");
 

diff --git a/core_v2/Move.toml b/core_v2/Move.toml
@@ -1,10 +1,10 @@
 [package]
-name = 'aptos_names_v2'
+name = 'aptos_names_v2_1'
 version = '1.0.0'
 
 [addresses]
 router_signer = "_"
-aptos_names_v2 = "_"
+aptos_names_v2_1 = "_"
 aptos_names_admin = "_"
 aptos_names_funds = "_"