Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
fix more multi-From inference issues
  • Loading branch information
coriolinus committed Jul 22, 2020
commit f14ffe589e20d664d8a900ed62f68b6fb844a514
6 changes: 3 additions & 3 deletions node/core/backing/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -798,9 +798,9 @@ mod tests {

impl Default for TestState {
fn default() -> Self {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let thread_a = ParaId::from(3);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let thread_a = ParaId::from(3_u32);

let chain_ids = vec![chain_a, chain_b, thread_a];

Expand Down
10 changes: 5 additions & 5 deletions node/network/statement-distribution/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -915,21 +915,21 @@ mod tests {
let candidate_a = {
let mut c = CommittedCandidateReceipt::default();
c.descriptor.relay_parent = parent_hash;
c.descriptor.para_id = 1.into();
c.descriptor.para_id = 1_u32.into();
c
};

let candidate_b = {
let mut c = CommittedCandidateReceipt::default();
c.descriptor.relay_parent = parent_hash;
c.descriptor.para_id = 2.into();
c.descriptor.para_id = 2_u32.into();
c
};

let candidate_c = {
let mut c = CommittedCandidateReceipt::default();
c.descriptor.relay_parent = parent_hash;
c.descriptor.para_id = 3.into();
c.descriptor.para_id = 3_u32.into();
c
};

Expand Down Expand Up @@ -1144,7 +1144,7 @@ mod tests {
let candidate = {
let mut c = CommittedCandidateReceipt::default();
c.descriptor.relay_parent = hash_c;
c.descriptor.para_id = 1.into();
c.descriptor.para_id = 1_u32.into();
c
};
let candidate_hash = candidate.hash();
Expand Down Expand Up @@ -1279,7 +1279,7 @@ mod tests {
let candidate = {
let mut c = CommittedCandidateReceipt::default();
c.descriptor.relay_parent = hash_b;
c.descriptor.para_id = 1.into();
c.descriptor.para_id = 1_u32.into();
c
};

Expand Down