[metadata] update to scale-info 0.3, removes string interning

.gitlab-ci.yml

@@ -255,7 +255,7 @@ publish-docs:
     - git fetch origin gh-pages
     # Generating Docs
     - time cargo doc --no-deps --all-features
-        -p scale-info -p ink_metadata -p ink_metadata_derive -p ink_core -p ink_core_derive
+        -p scale-info -p ink_metadata -p ink_core -p ink_core_derive
         -p ink_primitives -p ink_prelude -p ink_lang -p ink_lang_macro
     # saving README and docs
     - mv target/doc/ /tmp/

core/Cargo.toml

@@ -39,7 +39,7 @@ blake2 = { version = "0.9", optional = true }
 # Sadly couldn't be marked as dev-dependency.
 # Never use this crate outside of the off-chain environment!
 rand = { version = "0.7", default-features = false, features = ["alloc"], optional = true }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 # Workaround: we actually just need criterion as a dev-dependency, but
 # there is an issue with a doubly included std lib when executing

examples/delegator/Cargo.toml

@@ -15,7 +15,7 @@ scale = { package = "parity-scale-codec", version = "1.3", default-features = fa
 adder = { version = "2.1.0", path = "adder", default-features = false, features = ["ink-as-dependency"] }
 subber = { version = "2.1.0", path = "subber", default-features = false, features = ["ink-as-dependency"] }
 accumulator = { version = "2.1.0", path = "accumulator", default-features = false, features = ["ink-as-dependency"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "delegator"

examples/delegator/accumulator/Cargo.toml

@@ -11,7 +11,7 @@ ink_core = { version = "2.1.0", path = "../../../core", default-features = false
 ink_lang = { version = "2.1.0", path = "../../../lang", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "accumulator"

examples/delegator/adder/Cargo.toml

@@ -13,7 +13,7 @@ ink_lang = { version = "2.1.0", path = "../../../lang", default-features = false
 accumulator = { version = "2.1.0", path = "../accumulator", default-features = false, features = ["ink-as-dependency"] }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "adder"

examples/delegator/subber/Cargo.toml

@@ -13,7 +13,7 @@ ink_lang = { version = "2.1.0", path = "../../../lang", default-features = false
 accumulator = { version = "2.1.0", path = "../accumulator", default-features = false, features = ["ink-as-dependency"] }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "subber"

examples/dns/Cargo.toml

@@ -11,7 +11,7 @@ ink_core = { version = "2.1.0", path = "../../core", default-features = false }
 ink_lang = { version = "2.1.0", path = "../../lang", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "dns"

examples/erc20/Cargo.toml

@@ -11,7 +11,7 @@ ink_core = { version = "2.1.0", path = "../../core", default-features = false }
 ink_lang = { version = "2.1.0", path = "../../lang", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "erc20"

examples/erc721/Cargo.toml

@@ -11,7 +11,7 @@ ink_core = { version = "2.1.0", path = "../../core", default-features = false }
 ink_lang = { version = "2.1.0", path = "../../lang", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "erc721"

examples/flipper/Cargo.toml

@@ -11,7 +11,7 @@ ink_core = { version = "2.1.0", path = "../../core", default-features = false }
 ink_lang = { version = "2.1.0", path = "../../lang", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "flipper"

examples/incrementer/Cargo.toml

@@ -11,7 +11,7 @@ ink_core = { version = "2.1.0", path = "../../core", default-features = false }
 ink_lang = { version = "2.1.0", path = "../../lang", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "incrementer"

examples/multisig_plain/Cargo.toml

@@ -12,7 +12,7 @@ ink_lang = { version = "2.1.0", path = "../../lang", default-features = false }
 ink_prelude = { version = "2.1.0", path = "../../prelude", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "multisig_plain"

examples/runtime-storage/Cargo.toml

@@ -12,7 +12,7 @@ ink_core = { version = "2.1.0", path = "../../core", default-features = false }
 ink_lang = { version = "2.1.0", path = "../../lang", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "0.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "runtime_storage"

lang/macro/Cargo.toml

@@ -36,7 +36,7 @@ ink_lang = { version = "2.1.0", path = ".." }
 
 trybuild = "1.0.24"
 pretty_assertions = "0.6.1"
-scale-info = { version = "0.2", default-features = false, features = ["derive"] }
+scale-info = { version = "0.3", default-features = false, features = ["derive"] }
 
 [lib]
 name = "ink_lang_macro"

lang/macro/src/codegen/metadata.rs

@@ -242,15 +242,13 @@ impl GenerateMetadata<'_> {
     }
 
     fn generate_contract(&self) -> TokenStream2 {
-        let contract_ident_lit = self.contract.ident.to_string();
-
         let constructors = self.generate_constructors();
         let messages = self.generate_messages();
         let events = self.generate_events();
         let docs = self.generate_docs();
 
         quote! {
-            ::ink_metadata::ContractSpec::new(#contract_ident_lit)
+            ::ink_metadata::ContractSpec::new()
                 .constructors(vec![
                     #(#constructors ,)*
                 ])

metadata/Cargo.toml

@@ -20,11 +20,11 @@ ink_primitives = { version = "2.1.0", path = "../primitives/", default-features
 
 serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
 derive_more = { version = "0.99", default-features = false, features = ["from"] }
-scale-info = { version = "0.2", default-features = false, features = ["derive"] }
+scale-info = { version = "0.3", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
+pretty_assertions = "0.6.1"
 serde_json = "1.0"
-assert-json-diff = "1.0.1"
 
 [features]
 default = [

metadata/src/layout2/mod.rs

@@ -300,7 +300,7 @@ pub struct FieldLayout<F: Form = MetaForm> {
     /// The name of the field.
     ///
     /// Can be missing, e.g. in case of an enum tuple struct variant.
-    name: Option<F::String>,
+    name: Option<&'static str>,
     /// The kind of the field.
     ///
     /// This is either a direct layout bound
@@ -312,7 +312,7 @@ impl FieldLayout {
     /// Creates a new field layout.
     pub fn new<N, L>(name: N, layout: L) -> Self
     where
-        N: Into<Option<<MetaForm as Form>::String>>,
+        N: Into<Option<&'static str>>,
         L: Into<Layout>,
     {
         Self {
@@ -327,7 +327,7 @@ impl IntoCompact for FieldLayout {
 
     fn into_compact(self, registry: &mut Registry) -> Self::Output {
         FieldLayout {
-            name: self.name.map(|name| registry.register_string(name)),
+            name: self.name,
             layout: self.layout.into_compact(registry),
         }
     }

metadata/src/layout2/tests.rs

@@ -14,6 +14,7 @@
 
 use super::*;
 use ink_primitives::KeyPtr;
+use pretty_assertions::assert_eq;
 
 #[test]
 fn layout_key_works() {
@@ -60,7 +61,7 @@ fn named_fields_work() {
                                 "ty": 1,
                             }
                         },
-                        "name": 1,
+                        "name": "a",
                     },
                     {
                         "layout": {
@@ -73,7 +74,7 @@ fn named_fields_work() {
                                 "ty": 2,
                             }
                         },
-                        "name": 2,
+                        "name": "b",
                     }
                 ]
             }
@@ -293,7 +294,7 @@ fn mixed_enum_work() {
                                         "ty": 1,
                                     }
                                 },
-                                "name": 1,
+                                "name": "a",
                             },
                             {
                                 "layout": {
@@ -306,7 +307,7 @@ fn mixed_enum_work() {
                                         "ty": 2,
                                     }
                                 },
-                                "name": 2,
+                                "name": "b",
                             }
                         ],
                     },

metadata/src/lib.rs

@@ -41,6 +41,7 @@ pub use self::specs::{
     ReturnTypeSpec,
     TypeSpec,
 };
+
 #[cfg(feature = "derive")]
 use scale_info::{
     form::CompactForm,
@@ -49,24 +50,25 @@ use scale_info::{
 };
 use serde::Serialize;
 
-/// An entire ink! project for ABI file generation purposes.
+/// An entire ink! project for metadata file generation purposes.
 #[derive(Debug, Serialize)]
 pub struct InkProject {
+    #[serde(flatten)]
     registry: Registry,
     #[serde(rename = "storage")]
+    /// The layout of the storage data structure
     layout: layout2::Layout<CompactForm>,
-    #[serde(rename = "contract")]
     spec: ContractSpec<CompactForm>,
 }
 
 impl InkProject {
-    /// Creates a new ink! project.
     pub fn new<L, S>(layout: L, spec: S) -> Self
     where
         L: Into<layout2::Layout>,
         S: Into<ContractSpec>,
     {
         let mut registry = Registry::new();
+
         Self {
             layout: layout.into().into_compact(&mut registry),
             spec: spec.into().into_compact(&mut registry),