[refactoring] Remove display for tags (aptos-labs#16747)

- Display implementation of tags is removed
- `to_canonical_string()` should be used instead
- Fixes conversion of function tags to strings

Author: georgemitenkov

api/src/accounts.rs

@@ -664,7 +664,8 @@ impl Account {
             .find_resource(&state_view, self.address, resource_type)
             .context(format!(
                 "Failed to query DB to check for {} at {}",
-                resource_type, self.address
+                resource_type.to_canonical_string(),
+                self.address
             ))
             .map_err(|err| {
                 BasicErrorWith404::internal_with_code(

api/src/response.rs

@@ -663,7 +663,9 @@ pub fn resource_not_found<E: NotFoundError>(
         "Resource",
         format!(
             "Address({}), Struct tag({}) and Ledger version({})",
-            address, struct_tag, ledger_version
+            address,
+            struct_tag.to_canonical_string(),
+            ledger_version
         ),
         AptosErrorCode::ResourceNotFound,
         ledger_info,
@@ -698,7 +700,10 @@ pub fn struct_field_not_found<E: NotFoundError>(
         "Struct Field",
         format!(
             "Address({}), Struct tag({}), Field name({}) and Ledger version({})",
-            address, struct_tag, field_name, ledger_version
+            address,
+            struct_tag.to_canonical_string(),
+            field_name,
+            ledger_version
         ),
         AptosErrorCode::StructFieldNotFound,
         ledger_info,

api/src/state.rs

@@ -291,7 +291,8 @@ impl StateApi {
             .find_resource(&state_view, address, &tag)
             .context(format!(
                 "Failed to query DB to check for {} at {}",
-                tag, address
+                tag.to_canonical_string(),
+                address
             ))
             .map_err(|err| {
                 BasicErrorWith404::internal_with_code(

api/types/src/convert.rs

@@ -573,9 +573,9 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
 
         Ok(Some(DecodedTableData {
             key: key.json().unwrap(),
-            key_type: table_info.key_type.to_string(),
+            key_type: table_info.key_type.to_canonical_string(),
             value: value.json().unwrap(),
-            value_type: table_info.value_type.to_string(),
+            value_type: table_info.value_type.to_canonical_string(),
         }))
     }
 
@@ -596,7 +596,7 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
 
         Ok(Some(DeletedTableData {
             key: key.json().unwrap(),
-            key_type: table_info.key_type.to_string(),
+            key_type: table_info.key_type.to_canonical_string(),
         }))
     }
 

aptos-move/aptos-gas-profiling/src/aggregate.rs

@@ -99,7 +99,7 @@ impl ExecutionAndIOCosts {
                     addr: _addr,
                     ty,
                     cost,
-                } => insert_or_add(&mut storage_reads, format!("{}", ty), *cost),
+                } => insert_or_add(&mut storage_reads, ty.to_canonical_string(), *cost),
                 CreateTy { cost } => insert_or_add(&mut ops, "create_ty".to_string(), *cost),
             }
         }

aptos-move/aptos-gas-profiling/src/erased.rs

@@ -148,9 +148,10 @@ impl ExecutionGasEvent {
                 ),
                 *cost,
             ),
-            LoadResource { addr, ty, cost } => {
-                Node::new(format!("load<{}::{}>", Render(addr), ty), *cost)
-            },
+            LoadResource { addr, ty, cost } => Node::new(
+                format!("load<{}::{}>", Render(addr), ty.to_canonical_string()),
+                *cost,
+            ),
             CreateTy { cost } => Node::new("create_ty", *cost),
         }
     }
@@ -272,7 +273,7 @@ impl WriteStorage {
 
 impl EventStorage {
     fn to_erased(&self) -> Node<StoragePair> {
-        Node::new(format!("{}", self.ty), (self.cost, Fee::zero()))
+        Node::new(self.ty.to_canonical_string(), (self.cost, Fee::zero()))
     }
 }
 

aptos-move/aptos-gas-profiling/src/flamegraph.rs

@@ -47,7 +47,10 @@ impl StorageFees {
 
         for event in &self.events {
             // TODO: Handle discounts.
-            lines.push(format!("events;{}", event.ty), event.cost)
+            lines.push(
+                format!("events;{}", event.ty.to_canonical_string()),
+                event.cost,
+            )
         }
 
         lines.into_inner()
@@ -148,7 +151,12 @@ impl ExecutionAndIOCosts {
                             *cost,
                         ),
                         LoadResource { addr, ty, cost } => self.lines.push(
-                            format!("{};load<{}::{}>", self.path(), Render(addr), ty),
+                            format!(
+                                "{};load<{}::{}>",
+                                self.path(),
+                                Render(addr),
+                                ty.to_canonical_string()
+                            ),
                             *cost,
                         ),
                     }

aptos-move/aptos-gas-profiling/src/render.rs

@@ -45,9 +45,9 @@ impl<'a> Display for Render<'a, (&'a ModuleId, &'a IdentStr, &'a [TypeTag])> {
                 self.0
                      .2
                     .iter()
-                    .map(|ty| format!("{}", ty))
+                    .map(|ty| ty.to_canonical_string())
                     .collect::<Vec<_>>()
-                    .join(",")
+                    .join(", ")
             )?;
         }
         Ok(())
@@ -75,8 +75,8 @@ impl Display for Render<'_, Path> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.0 {
             Path::Code(module_id) => write!(f, "{}", Render(module_id)),
-            Path::Resource(struct_ty) => write!(f, "{}", struct_ty),
-            Path::ResourceGroup(struct_ty) => write!(f, "{}", struct_ty),
+            Path::Resource(struct_ty) => write!(f, "{}", struct_ty.to_canonical_string()),
+            Path::ResourceGroup(struct_ty) => write!(f, "{}", struct_ty.to_canonical_string()),
         }
     }
 }
@@ -130,6 +130,6 @@ impl Display for Render<'_, WriteOpType> {
 
 impl Display for Render<'_, TypeTag> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
+        write!(f, "{}", self.0.to_canonical_string())
     }
 }

aptos-move/aptos-gas-profiling/src/report.rs

@@ -285,7 +285,7 @@ impl TransactionGasLog {
                     .iter()
                     .map(|event| {
                         json!({
-                            "name":  format!("{}", event.ty),
+                            "name":  format!("{}", event.ty.to_canonical_string()),
                             "cost": fmt_storage_fee(event.cost),
                             "cost-percentage": fmt_storage_fee_percentage(event.cost),
                         })

aptos-move/aptos-sdk-builder/src/common.rs

@@ -18,11 +18,11 @@ use std::{
 pub(crate) fn type_not_allowed(type_tag: &TypeTag) -> ! {
     panic!(
         "Transaction scripts cannot take arguments of type {}.",
-        type_tag
+        type_tag.to_canonical_string()
     );
 }
 
-/// Clean up doc comments extracter by the Move prover.
+/// Clean up doc comments extracted by the Move prover.
 pub(crate) fn prepare_doc_string(doc: &str) -> String {
     doc.replace("\n ", "\n").trim().to_string()
 }