Remove admin for mints

aptos-labs · May 9, 2024 · 28e32dd · 28e32dd
1 parent a76f5f4
commit 28e32dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 37 deletions.
diff --git a/only-on-aptos/sources/only_on_aptos.move b/only-on-aptos/sources/only_on_aptos.move
@@ -124,7 +124,6 @@ module only_on_aptos::only_on_aptos {
     ) acquires CollectionConfig, MetadataConfig {
         let user_addr = signer::address_of(user);
         let token = mint_impl(
-            user,
             collection_config_object,
             user_addr,
         );
@@ -136,32 +135,6 @@ module only_on_aptos::only_on_aptos {
         });
     }
 
-    // only used by txn emitter for load testing
-    public entry fun mint_with_admin_worker(
-        _worker: &signer,
-        admin: &signer,
-        collection_config_object: Object<CollectionConfig>,
-        recipient_addr: address,
-    ) acquires CollectionConfig, MetadataConfig {
-        mint_with_admin_impl(
-            admin,
-            collection_config_object,
-            recipient_addr,
-        );
-    }
-
-    public entry fun mint_with_admin(
-        admin: &signer,
-        collection_config_object: Object<CollectionConfig>,
-        recipient_addr: address,
-    ) acquires CollectionConfig, MetadataConfig {
-        mint_with_admin_impl(
-            admin,
-            collection_config_object,
-            recipient_addr,
-        );
-    }
-
     public entry fun set_minting_status(
         admin: &signer,
         collection_config_object: Object<CollectionConfig>,
@@ -193,17 +166,14 @@ module only_on_aptos::only_on_aptos {
         token_components::burn(&collection_signer, token);
     }
 
-    public fun mint_with_admin_impl(
-        admin: &signer,
+    public fun mint_to_recipient(
         collection_config_object: Object<CollectionConfig>,
         recipient_addr: address,
     ): Object<Token> acquires CollectionConfig, MetadataConfig {
-        assert_owner(signer::address_of(admin), collection_config_object);
-        mint_impl(admin, collection_config_object, recipient_addr)
+        mint_impl(collection_config_object, recipient_addr)
     }
 
     fun mint_impl(
-        _minter: &signer,
         collection_config_object: Object<CollectionConfig>,
         recipient_addr: address,
     ): Object<Token> acquires CollectionConfig, MetadataConfig {
@@ -223,7 +193,7 @@ module only_on_aptos::only_on_aptos {
             collection::name(collection),
             metadata_config.token_description,
             metadata_config.token_name_prefix,
-            utf8(b""), // name_with_index_suffix 
+            utf8(b""), // name_with_index_suffix
             royalty::get(collection),
             uri,
         );
@@ -454,6 +424,6 @@ module only_on_aptos::only_on_aptos {
         collection_config_object: Object<CollectionConfig>,
         recipient_addr: address,
     ): Object<Token> acquires CollectionConfig, MetadataConfig {
-        mint_impl(minter, collection_config_object, recipient_addr)
+        mint_impl(collection_config_object, recipient_addr)
     }
-}
+}
diff --git a/only-on-aptos/tests/only_on_aptos_tests.move b/only-on-aptos/tests/only_on_aptos_tests.move
@@ -14,8 +14,7 @@ module only_on_aptos::only_on_aptos_tests {
         let user_address = signer::address_of(user);
         let collection_config = create_collection_helper(admin);
         only_on_aptos::set_minting_status(admin, collection_config, true);
-        let admin_minted_token = only_on_aptos::mint_with_admin_impl(
-            admin,
+        let admin_minted_token = only_on_aptos::mint_to_recipient(
             collection_config,
             user_address,
         );