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

Issue 212 - refactor Checkable trait to be more generic #287

Merged
gavofyork merged 21 commits into from
Jul 11, 2018
Merged

Issue 212 - refactor Checkable trait to be more generic #287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7937af9
runtime: refactor Checkable and BlindCheckable traits
snd Jul 5, 2018
cf080b0
fix impl BlindCheckable for Extrinsic
snd Jul 5, 2018
0b2ff34
fix impl Checkable for TestXt
snd Jul 5, 2018
d277169
fix impl Checkable for UncheckedExtrinsic
snd Jul 5, 2018
60a9e0c
fix tabs
snd Jul 5, 2018
02eb103
add ::Address to system::Trait since its no longer in Checkable trait
snd Jul 6, 2018
b42b484
replace tab by space in comment
snd Jul 6, 2018
05fe805
replace occurences of Checkable::check with ::check_with
snd Jul 6, 2018
6a90ab5
tx-pool: replace CheckedIntrinsic type alias since it now would requi…
snd Jul 6, 2018
de69b7a
make more uses of Checkable compile
snd Jul 6, 2018
574b2a8
adapt Executive impl to new Checkable trait
snd Jul 6, 2018
8da0a5a
fix that CheckedExtrinsic takes AccountId not Address as first type p…
snd Jul 6, 2018
7cccc1d
Checkable trait: return error again since it's required in some cases
snd Jul 6, 2018
b147c0a
Checkable: improve docstrings
snd Jul 6, 2018
7642b81
consistent punctuation and capitalization in docstrings
snd Jul 7, 2018
70ab210
Ctx -> Context
snd Jul 9, 2018
f4fcebb
reduce trait bounds for impl Checkable for TestXt
snd Jul 9, 2018
21676fe
use <UncheckedExtrinsic as Checkable>::Checked
snd Jul 9, 2018
2e3e4a8
Revert "add ::Address to system::Trait since its no longer in Checkab…
snd Jul 9, 2018
6e550d8
runtime/executive: properly fix that Address no longer in Checkable
snd Jul 9, 2018
eef85e1
return `Result<Self::Checked, &'static str>` from `Checkable::check`
snd Jul 10, 2018
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
add ::Address to system::Trait since its no longer in Checkable trait
  • Loading branch information
@snd
snd committed Jul 6, 2018
commit 02eb103015b833c995c9f9067aac2542bb7ce5ea
1 change: 1 addition & 0 deletions demo/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ impl system::Trait for Concrete {
type Hashing = BlakeTwo256;
type Digest = generic::Digest<Vec<u8>>;
type AccountId = AccountId;
type Address = Address;
type Header = generic::Header<BlockNumber, BlakeTwo256, Vec<u8>>;
}

Expand Down
1 change: 1 addition & 0 deletions polkadot/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ impl system::Trait for Concrete {
type Hashing = BlakeTwo256;
type Digest = generic::Digest<Log>;
type AccountId = AccountId;
type Address = Address;
type Header = Header;
}
/// System module for this concrete runtime.
Expand Down
1 change: 1 addition & 0 deletions polkadot/runtime/src/parachains.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ mod tests {
type Hashing = BlakeTwo256;
type Digest = Digest;
type AccountId = u64;
type Address = u64;
type Header = Header;
}
impl session::Trait for Test {
Expand Down
1 change: 1 addition & 0 deletions substrate/runtime/council/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,7 @@ mod tests {
type Hashing = BlakeTwo256;
type Digest = Digest;
type AccountId = u64;
type Address = u64;
type Header = Header;
}
impl session::Trait for Test {
Expand Down
1 change: 1 addition & 0 deletions substrate/runtime/democracy/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ mod tests {
type Hashing = BlakeTwo256;
type Digest = Digest;
type AccountId = u64;
type Address = u64;
type Header = Header;
}
impl session::Trait for Test {
Expand Down
1 change: 1 addition & 0 deletions substrate/runtime/executive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ mod tests {
type Hashing = BlakeTwo256;
type Digest = Digest;
type AccountId = u64;
type Address = u64;
type Header = Header;
}
impl session::Trait for Test {
Expand Down
1 change: 1 addition & 0 deletions substrate/runtime/session/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ mod tests {
type Hashing = BlakeTwo256;
type Digest = Digest;
type AccountId = u64;
type Address = u64;
type Header = Header;
}
impl timestamp::Trait for Test {
Expand Down
1 change: 1 addition & 0 deletions substrate/runtime/staking/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ impl system::Trait for Test {
type Hashing = ::primitives::traits::BlakeTwo256;
type Digest = Digest;
type AccountId = u64;
type Address = u64;
type Header = Header;
}
impl session::Trait for Test {
Expand Down
1 change: 1 addition & 0 deletions substrate/runtime/system/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ pub trait Trait: Eq + Clone {
type Hashing: Hashing<Output = Self::Hash>;
type Digest: Parameter + Member + Default + traits::Digest;
type AccountId: Parameter + Member + MaybeDisplay + Ord + Default;
type Address: Parameter + Member + MaybeDisplay;
Copy link
Member

@gavofyork gavofyork Jul 9, 2018

Choose a reason for hiding this comment

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

Not super keen on having Address up here since it shouldn't be used prior to the staking module. What's the reason?

Copy link
Contributor Author

@snd snd Jul 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

i see. for my reasoning see paritytech/polkadot#212 (comment). where should we put Address instead?

Copy link
Contributor Author

@snd snd Jul 9, 2018

Choose a reason for hiding this comment

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

i was on the wrong track when i did that. reverted adding the Address paritytech/polkadot@2e3e4a8 and properly adapted to changed Checkable trait paritytech/polkadot@6e550d8

type Header: Parameter + traits::Header<
Number = Self::BlockNumber,
Hashing = Self::Hashing,
Expand Down
1 change: 1 addition & 0 deletions substrate/runtime/timestamp/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ mod tests {
type Hashing = BlakeTwo256;
type Digest = Digest;
type AccountId = u64;
type Address = u64;
type Header = Header;
}
impl consensus::Trait for Test {
Expand Down