Skip to content

[metadata] update scale-info, remove string parameterization #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ascjones merged 5 commits into from
Feb 5, 2021
Merged

[metadata] update scale-info, remove string parameterization #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08a9c2a
Temporarily use new scale-info branch until release
ascjones Feb 2, 2021
7726b36
[metadata] update scale-info, remove string parameterization
ascjones Feb 2, 2021
99975bd
Revert "Temporarily use new scale-info branch until release"
ascjones Feb 5, 2021
9e969af
Upgrade scale-info to 0.6
ascjones Feb 5, 2021
64e68d3
Add missing version update
ascjones Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/env/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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.8", default-features = false, features = ["alloc"], optional = true }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion crates/lang/macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ink_storage = { version = "3.0.0-rc2", path = "../../storage/" }
ink_lang = { version = "3.0.0-rc2", path = ".." }

trybuild = "1.0.24"
scale-info = { version = "0.5", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"] }

[lib]
name = "ink_lang_macro"
Expand Down
2 changes: 1 addition & 1 deletion crates/metadata/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ink_primitives = { version = "3.0.0-rc2", path = "../primitives/", default-featu
serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
impl-serde = "0.3.1"
derive_more = { version = "0.99", default-features = false, features = ["from"] }
scale-info = { version = "0.5", default-features = false, features = ["derive", "serde"] }
scale-info = { version = "0.6", default-features = false, features = ["derive", "serde"] }

[dev-dependencies]
pretty_assertions = "0.6.1"
Expand Down
26 changes: 9 additions & 17 deletions crates/metadata/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,25 @@ use impl_serde::serialize as serde_hex;

#[cfg(feature = "derive")]
use scale_info::{
form::{
FormString,
PortableForm,
},
form::PortableForm,
IntoPortable as _,
PortableRegistry,
Registry,
};
use serde::{
de::DeserializeOwned,
Deserialize,
Serialize,
};

/// An entire ink! project for metadata file generation purposes.
#[derive(Debug, Serialize, Deserialize)]
#[serde(bound(deserialize = "S: DeserializeOwned"))]
pub struct InkProject<S: FormString = &'static str> {
pub struct InkProject {
#[serde(flatten)]
registry: PortableRegistry<S>,
registry: PortableRegistry,
#[serde(rename = "storage")]
/// The layout of the storage data structure
layout: layout::Layout<PortableForm<S>>,
spec: ContractSpec<PortableForm<S>>,
layout: layout::Layout<PortableForm>,
spec: ContractSpec<PortableForm>,
}

impl InkProject {
Expand All @@ -89,22 +84,19 @@ impl InkProject {
}
}

impl<S> InkProject<S>
where
S: FormString,
{
impl InkProject {
/// Returns a read-only registry of types in the contract.
pub fn registry(&self) -> &PortableRegistry<S> {
pub fn registry(&self) -> &PortableRegistry {
&self.registry
}

/// Returns the storage layout of the contract.
pub fn layout(&self) -> &layout::Layout<PortableForm<S>> {
pub fn layout(&self) -> &layout::Layout<PortableForm> {
&self.layout
}

/// Returns the specification of the contract.
pub fn spec(&self) -> &ContractSpec<PortableForm<S>> {
pub fn spec(&self) -> &ContractSpec<PortableForm> {
&self.spec
}
}
4 changes: 2 additions & 2 deletions crates/metadata/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fn spec_constructor_selector_must_serialize_to_hex() {

// when
let json = serde_json::to_value(&portable_spec).unwrap();
let deserialized: ConstructorSpec<PortableForm<String>> =
let deserialized: ConstructorSpec<PortableForm> =
serde_json::from_value(json.clone()).unwrap();

// then
Expand Down Expand Up @@ -183,7 +183,7 @@ fn trim_docs() {

// when
let json = serde_json::to_value(&compact_spec).unwrap();
let deserialized: ConstructorSpec<PortableForm<String>> =
let deserialized: ConstructorSpec<PortableForm> =
serde_json::from_value(json.clone()).unwrap();

// then
Expand Down
2 changes: 1 addition & 1 deletion crates/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]
ink_prelude = { version = "3.0.0-rc2", path = "../prelude/", default-features = false }
tiny-keccak = { version = "2.0", features = ["keccak"] }
scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive", "full"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ink_prelude = { version = "3.0.0-rc2", path = "../prelude/", default-features =

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive", "full"] }
derive_more = { version = "0.99", default-features = false, features = ["from", "display"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
cfg-if = "1.0"
array-init = "1.0"
generic-array = "0.14.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/contract-terminate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc1", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc1", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/contract-transfer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc1", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc1", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/delegator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ scale = { package = "parity-scale-codec", version = "2.0", default-features = fa
adder = { version = "3.0.0-rc2", path = "adder", default-features = false, features = ["ink-as-dependency"] }
subber = { version = "3.0.0-rc2", path = "subber", default-features = false, features = ["ink-as-dependency"] }
accumulator = { version = "3.0.0-rc2", path = "accumulator", default-features = false, features = ["ink-as-dependency"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }

[lib]
name = "delegator"
Expand Down
2 changes: 1 addition & 1 deletion examples/delegator/accumulator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc2", path = "../../../crates/storage", default
ink_lang = { version = "3.0.0-rc2", path = "../../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/delegator/adder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ink_lang = { version = "3.0.0-rc2", path = "../../../crates/lang", default-featu
accumulator = { version = "3.0.0-rc2", path = "../accumulator", default-features = false, features = ["ink-as-dependency"] }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/delegator/subber/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ink_lang = { version = "3.0.0-rc2", path = "../../../crates/lang", default-featu
accumulator = { version = "3.0.0-rc2", path = "../accumulator", default-features = false, features = ["ink-as-dependency"] }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/dns/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc2", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc2", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/erc20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc2", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc2", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/erc721/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc2", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc2", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/flipper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc2", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc2", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/incrementer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc2", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc2", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/multisig_plain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ink_lang = { version = "3.0.0-rc2", path = "../../crates/lang", default-features
ink_prelude = { version = "3.0.0-rc2", path = "../../crates/prelude", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/rand-extension/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { path = "../../crates/storage", default-features = false }
ink_lang = { path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }

[lib]
name = "rand_extension"
Expand Down
2 changes: 1 addition & 1 deletion examples/trait-erc20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc2", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc2", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }


[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/trait-flipper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc2", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc2", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"] }
scale-info = { version = "0.5", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }

[lib]
name = "flipper"
Expand Down