Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Companion for #13302 #2357

Merged
merged 9 commits into from
Apr 11, 2023
Merged

Companion for #13302 #2357

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4402e6d
primitives/core: Derive scale_info::TypeInfo for runtime APIs
lexnv Mar 21, 2023
da9fdca
parachains: Derive scale_info::TypeInfo for FungiblesAccessError
lexnv Mar 21, 2023
82f7934
Merge remote-tracking branch 'origin/master' into lexnv/md15_runtime_…
lexnv Mar 22, 2023
e13ac2a
parachains: Fix `TypeInfo` import path
lexnv Mar 22, 2023
6e84ddc
Merge remote-tracking branch 'origin/master' into lexnv/md15_runtime_…
lexnv Mar 30, 2023
398a8e4
Merge remote-tracking branch 'origin/master' into lexnv/md15_runtime_…
Apr 10, 2023
130c74d
update lockfile for {"polkadot", "substrate"}
Apr 11, 2023
5e444cf
Adjust testing for the new API
lexnv Apr 11, 2023
15ac026
Adjust deprecated methods
lexnv Apr 11, 2023
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: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions parachains/runtimes/assets/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ description = "Assets common utilities"

[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
log = { version = "0.4.17", default-features = false }

# Substrate
Expand Down
2 changes: 1 addition & 1 deletion parachains/runtimes/assets/common/src/runtime_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use sp_std::vec::Vec;
use xcm::latest::MultiAsset;

/// The possible errors that can happen querying the storage of assets.
#[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
#[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug, scale_info::TypeInfo)]
pub enum FungiblesAccessError {
/// `MultiLocation` to `AssetId`/`ClassId` conversion failed.
AssetIdConversionFailed,
Expand Down
2 changes: 2 additions & 0 deletions primitives/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ edition = "2021"

[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }

# Substrate
sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
Expand All @@ -23,6 +24,7 @@ xcm = { git = "https://github.com/paritytech/polkadot", default-features = false
default = [ "std" ]
std = [
"codec/std",
"scale-info/std",
"sp-api/std",
"sp-runtime/std",
"sp-std/std",
Expand Down
3 changes: 2 additions & 1 deletion primitives/core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

use codec::{Decode, Encode};
use polkadot_parachain::primitives::HeadData;
use scale_info::TypeInfo;
use sp_runtime::{traits::Block as BlockT, RuntimeDebug};
use sp_std::prelude::*;

Expand Down Expand Up @@ -229,7 +230,7 @@ impl CollationInfoV1 {
}

/// Information about a collation.
#[derive(Clone, Debug, codec::Decode, codec::Encode, PartialEq)]
#[derive(Clone, Debug, codec::Decode, codec::Encode, PartialEq, TypeInfo)]
pub struct CollationInfo {
/// Messages destined to be interpreted by the Relay chain itself.
pub upward_messages: Vec<UpwardMessage>,
Expand Down