Skip to content

Update to new scale-info and codec releases #663

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
Robbepop merged 8 commits into from
Jan 28, 2021
Merged

Update to new scale-info and codec releases #663

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
526441c
Update to scale-info 0.5
ascjones Jan 28, 2021
658f90b
Update TypeInfo manual impls
ascjones Jan 28, 2021
7680bc9
Update parity-scale-code to 2.0
ascjones Jan 28, 2021
12b5bc7
Add Encode ?Sized bounds
ascjones Jan 28, 2021
8e740cb
Change type display name for Key custom TypeInfo impl
ascjones Jan 28, 2021
3c163ce
Add missing ?Sized constraint
ascjones Jan 28, 2021
017d260
Fmt
ascjones Jan 28, 2021
c6e35ce
Missing ?Sized bound in example
ascjones Jan 28, 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
Prev Previous commit
Next Next commit
Fmt
  • Loading branch information
@ascjones
ascjones committed Jan 28, 2021
commit 017d260d57f23f1e14b13c9c495e31818edbf04d
10 changes: 7 additions & 3 deletions crates/metadata/src/layout/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ use ink_prelude::collections::btree_map::BTreeMap;
use ink_primitives::Key;
use scale_info::{
form::{
PortableForm,
Form,
MetaForm,
PortableForm,
},
meta_type,
IntoPortable,
Expand Down Expand Up @@ -165,14 +165,18 @@ impl IntoPortable for Layout {
Layout::Cell(encoded_cell) => {
Layout::Cell(encoded_cell.into_portable(registry))
}
Layout::Hash(hash_layout) => Layout::Hash(hash_layout.into_portable(registry)),
Layout::Hash(hash_layout) => {
Layout::Hash(hash_layout.into_portable(registry))
}
Layout::Array(array_layout) => {
Layout::Array(array_layout.into_portable(registry))
}
Layout::Struct(struct_layout) => {
Layout::Struct(struct_layout.into_portable(registry))
}
Layout::Enum(enum_layout) => Layout::Enum(enum_layout.into_portable(registry)),
Layout::Enum(enum_layout) => {
Layout::Enum(enum_layout.into_portable(registry))
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions crates/metadata/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ use impl_serde::serialize as serde_hex;
#[cfg(feature = "derive")]
use scale_info::{
form::{
FormString,
Copy link
Collaborator

@Robbepop Robbepop Jan 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is a FormString bringing to the table?

PortableForm,
FormString
},
IntoPortable as _,
Registry,
PortableRegistry,
Registry,
};
use serde::{
de::DeserializeOwned,
Expand Down Expand Up @@ -91,7 +91,7 @@ impl InkProject {

impl<S> InkProject<S>
where
S: FormString
S: FormString,
{
/// Returns a read-only registry of types in the contract.
pub fn registry(&self) -> &PortableRegistry<S> {
Expand Down
2 changes: 1 addition & 1 deletion crates/metadata/src/specs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ use alloc::{
use core::marker::PhantomData;
use scale_info::{
form::{
PortableForm,
Form,
MetaForm,
PortableForm,
},
meta_type,
IntoPortable,
Expand Down