[framework] remove creation name from token

feedback was that it was confusing
also planning on moving to guid token by default

aptos-move/e2e-move-tests/src/tests/token_objects.rs

@@ -15,7 +15,6 @@ struct Token {
     collection_id: u64,
     description: String,
     name: String,
-    creation_name: Option<String>,
     uri: String,
     mutation_events: EventHandle,
 }

aptos-move/framework/aptos-token-objects/doc/token.md

@@ -27,7 +27,6 @@ TODO:
 -  [Function `creator`](#0x4_token_creator)
 -  [Function `collection`](#0x4_token_collection)
 -  [Function `collection_object`](#0x4_token_collection_object)
--  [Function `creation_name`](#0x4_token_creation_name)
 -  [Function `description`](#0x4_token_description)
 -  [Function `name`](#0x4_token_name)
 -  [Function `uri`](#0x4_token_uri)
@@ -94,13 +93,6 @@ Represents the common fields to all tokens.
  should be smaller than 128, characters, eg: "Aptos Animal #1234"
 </dd>
 <dt>
-<code>creation_name: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_Option">option::Option</a>&lt;<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>&gt;</code>
-</dt>
-<dd>
- The creation name of the token. Since tokens are created with the name as part of the
- object id generation.
-</dd>
-<dt>
 <code>uri: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a></code>
 </dt>
 <dd>
@@ -284,7 +276,6 @@ Creates a new token object and returns the ConstructorRef for additional special
         collection_id: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_get_with_default">option::get_with_default</a>(&<b>mut</b> id, 0),
         description,
         name,
-        creation_name: <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_none">option::none</a>(),
         uri,
         mutation_events: <a href="../../aptos-framework/doc/object.md#0x1_object_new_event_handle">object::new_event_handle</a>(&object_signer),
     };
@@ -511,35 +502,6 @@ Extracts the tokens address from a BurnRef.
 
 
 
-</details>
-
-<a name="0x4_token_creation_name"></a>
-
-## Function `creation_name`
-
-
-
-<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_creation_name">creation_name</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: <a href="../../aptos-framework/doc/object.md#0x1_object_Object">object::Object</a>&lt;T&gt;): <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string_String">string::String</a>
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
-
-<pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_creation_name">creation_name</a>&lt;T: key&gt;(<a href="token.md#0x4_token">token</a>: Object&lt;T&gt;): String <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
-    <b>let</b> <a href="token.md#0x4_token">token</a> = borrow(&<a href="token.md#0x4_token">token</a>);
-    <b>if</b> (<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&<a href="token.md#0x4_token">token</a>.creation_name)) {
-        *<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_borrow">option::borrow</a>(&<a href="token.md#0x4_token">token</a>.creation_name)
-    } <b>else</b> {
-        <a href="token.md#0x4_token">token</a>.name
-    }
-}
-</code></pre>
-
-
-
 </details>
 
 <a name="0x4_token_description"></a>
@@ -682,7 +644,6 @@ Extracts the tokens address from a BurnRef.
         collection_id,
         description: _,
         name: _,
-        creation_name: _,
         uri: _,
         mutation_events,
     } = <b>move_from</b>&lt;<a href="token.md#0x4_token_Token">Token</a>&gt;(addr);
@@ -742,9 +703,6 @@ Extracts the tokens address from a BurnRef.
 
 <pre><code><b>public</b> <b>fun</b> <a href="token.md#0x4_token_set_name">set_name</a>(mutator_ref: &<a href="token.md#0x4_token_MutatorRef">MutatorRef</a>, name: String) <b>acquires</b> <a href="token.md#0x4_token_Token">Token</a> {
     <b>let</b> <a href="token.md#0x4_token">token</a> = borrow_mut(mutator_ref);
-    <b>if</b> (<a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_none">option::is_none</a>(&<a href="token.md#0x4_token">token</a>.creation_name)) {
-        <a href="../../aptos-framework/../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_fill">option::fill</a>(&<b>mut</b> <a href="token.md#0x4_token">token</a>.creation_name, <a href="token.md#0x4_token">token</a>.name)
-    };
     <a href="token.md#0x4_token">token</a>.name = name;
     <a href="../../aptos-framework/doc/event.md#0x1_event_emit_event">event::emit_event</a>(
         &<b>mut</b> <a href="token.md#0x4_token">token</a>.mutation_events,

aptos-move/framework/aptos-token-objects/sources/token.move

@@ -38,9 +38,6 @@ module aptos_token_objects::token {
         /// The name of the token, which should be unique within the collection; the length of name
         /// should be smaller than 128, characters, eg: "Aptos Animal #1234"
         name: String,
-        /// The creation name of the token. Since tokens are created with the name as part of the
-        /// object id generation.
-        creation_name: Option<String>,
         /// The Uniform Resource Identifier (uri) pointing to the JSON file stored in off-chain
         /// storage; the URL length will likely need a maximum any suggestions?
         uri: String,
@@ -91,7 +88,6 @@ module aptos_token_objects::token {
             collection_id: option::get_with_default(&mut id, 0),
             description,
             name,
-            creation_name: option::none(),
             uri,
             mutation_events: object::new_event_handle(&object_signer),
         };
@@ -169,16 +165,6 @@ module aptos_token_objects::token {
         borrow(&token).collection
     }
 
-    #[view]
-    public fun creation_name<T: key>(token: Object<T>): String acquires Token {
-        let token = borrow(&token);
-        if (option::is_some(&token.creation_name)) {
-            *option::borrow(&token.creation_name)
-        } else {
-            token.name
-        }
-    }
-
     #[view]
     public fun description<T: key>(token: Object<T>): String acquires Token {
         borrow(&token).description
@@ -238,7 +224,6 @@ module aptos_token_objects::token {
             collection_id,
             description: _,
             name: _,
-            creation_name: _,
             uri: _,
             mutation_events,
         } = move_from<Token>(addr);
@@ -258,9 +243,6 @@ module aptos_token_objects::token {
 
     public fun set_name(mutator_ref: &MutatorRef, name: String) acquires Token {
         let token = borrow_mut(mutator_ref);
-        if (option::is_none(&token.creation_name)) {
-            option::fill(&mut token.creation_name, token.name)
-        };
         token.name = name;
         event::emit_event(
             &mut token.mutation_events,
@@ -406,13 +388,8 @@ module aptos_token_objects::token {
 
         let name = string::utf8(b"no fail");
         assert!(name != name(token), 0);
-        {
-            let token = borrow_global<Token>(object::object_address(&token));
-            assert!(option::is_none(&token.creation_name), 1);
-        };
         set_name(&mutator_ref, *&name);
         assert!(name == name(token), 2);
-        assert!(token_name == creation_name(token), 3);
     }
 
     #[test(creator = @0x123)]