mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-20 16:21:02 +00:00
Fix clippy warnings (#7625)
* Fix clippy check Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Autofix clippy Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix trivial Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * fmt Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * suppress warnings Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Quiet clippy 😌 Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Oliver Tale-Yazdi
committed by
GitHub
GitHub
parent
a0f83eb992
commit
d501d92176
@@ -53,7 +53,7 @@ struct TestClock {
|
||||
|
||||
impl TestClock {
|
||||
fn now(&self) -> Duration {
|
||||
self.inner.lock().clone()
|
||||
*self.inner.lock()
|
||||
}
|
||||
|
||||
fn inc(&self, by: Duration) {
|
||||
|
||||
@@ -283,7 +283,6 @@ fn backing_second_works() {
|
||||
pov_hash,
|
||||
head_data: expected_head_data.clone(),
|
||||
erasure_root: make_erasure_root(&test_state, pov.clone()),
|
||||
..Default::default()
|
||||
}
|
||||
.build();
|
||||
|
||||
@@ -373,7 +372,6 @@ fn backing_works() {
|
||||
pov_hash,
|
||||
head_data: expected_head_data.clone(),
|
||||
erasure_root: make_erasure_root(&test_state, pov.clone()),
|
||||
..Default::default()
|
||||
}
|
||||
.build();
|
||||
|
||||
@@ -522,7 +520,6 @@ fn backing_works_while_validation_ongoing() {
|
||||
pov_hash,
|
||||
head_data: expected_head_data.clone(),
|
||||
erasure_root: make_erasure_root(&test_state, pov.clone()),
|
||||
..Default::default()
|
||||
}
|
||||
.build();
|
||||
|
||||
@@ -699,7 +696,6 @@ fn backing_misbehavior_works() {
|
||||
pov_hash,
|
||||
erasure_root: make_erasure_root(&test_state, pov.clone()),
|
||||
head_data: expected_head_data.clone(),
|
||||
..Default::default()
|
||||
}
|
||||
.build();
|
||||
|
||||
@@ -884,7 +880,6 @@ fn backing_dont_second_invalid() {
|
||||
pov_hash: pov_hash_b,
|
||||
erasure_root: make_erasure_root(&test_state, pov_block_b.clone()),
|
||||
head_data: expected_head_data.clone(),
|
||||
..Default::default()
|
||||
}
|
||||
.build();
|
||||
|
||||
@@ -1215,7 +1210,6 @@ fn backing_doesnt_second_wrong_collator() {
|
||||
pov_hash,
|
||||
head_data: expected_head_data.clone(),
|
||||
erasure_root: make_erasure_root(&test_state, pov.clone()),
|
||||
..Default::default()
|
||||
}
|
||||
.build();
|
||||
|
||||
@@ -1267,7 +1261,6 @@ fn validation_work_ignores_wrong_collator() {
|
||||
pov_hash,
|
||||
head_data: expected_head_data.clone(),
|
||||
erasure_root: make_erasure_root(&test_state, pov.clone()),
|
||||
..Default::default()
|
||||
}
|
||||
.build();
|
||||
|
||||
@@ -1541,7 +1534,6 @@ fn observes_backing_even_if_not_validator() {
|
||||
pov_hash,
|
||||
head_data: expected_head_data.clone(),
|
||||
erasure_root: make_erasure_root(&test_state, pov.clone()),
|
||||
..Default::default()
|
||||
}
|
||||
.build();
|
||||
|
||||
|
||||
@@ -568,7 +568,7 @@ fn assert_backend_contains<'a>(
|
||||
|
||||
fn assert_backend_contains_chains(backend: &TestBackend, chains: Vec<Vec<(Header, BlockWeight)>>) {
|
||||
for chain in chains {
|
||||
assert_backend_contains(backend, chain.iter().map(|&(ref hdr, _)| hdr))
|
||||
assert_backend_contains(backend, chain.iter().map(|(hdr, _)| hdr))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -688,7 +688,7 @@ fn import_chain_on_finalized_incrementally() {
|
||||
.await;
|
||||
|
||||
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 1);
|
||||
assert_backend_contains(&backend, chain.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![head_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![head_hash]).await;
|
||||
|
||||
@@ -721,8 +721,8 @@ fn import_two_subtrees_on_finalized() {
|
||||
import_blocks_into(&mut virtual_overseer, &backend, None, chain_b.clone()).await;
|
||||
|
||||
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 1);
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![b_hash, a_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![b_hash, a_hash]).await;
|
||||
|
||||
@@ -755,8 +755,8 @@ fn import_two_subtrees_on_nonzero_finalized() {
|
||||
import_blocks_into(&mut virtual_overseer, &backend, None, chain_b.clone()).await;
|
||||
|
||||
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 101);
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![b_hash, a_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![b_hash, a_hash]).await;
|
||||
|
||||
@@ -799,9 +799,9 @@ fn leaves_ordered_by_weight_and_then_number() {
|
||||
.await;
|
||||
|
||||
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 1);
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_c.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
|
||||
assert_backend_contains(&backend, chain_c.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![c2_hash, a3_hash, b2_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![c2_hash, a3_hash, b2_hash]).await;
|
||||
virtual_overseer
|
||||
@@ -844,8 +844,8 @@ fn subtrees_imported_even_with_gaps() {
|
||||
.await;
|
||||
|
||||
assert_eq!(backend.load_first_block_number().unwrap().unwrap(), 1);
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![b5_hash, a3_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![b5_hash, a3_hash]).await;
|
||||
|
||||
@@ -878,7 +878,7 @@ fn reversion_removes_viability_of_chain() {
|
||||
)
|
||||
.await;
|
||||
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![]);
|
||||
assert_finalized_leaves_query(&mut virtual_overseer, finalized_number, finalized_hash)
|
||||
.await;
|
||||
@@ -914,7 +914,7 @@ fn reversion_removes_viability_and_finds_ancestor_as_leaf() {
|
||||
)
|
||||
.await;
|
||||
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![a1_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![a1_hash]).await;
|
||||
|
||||
@@ -954,15 +954,15 @@ fn ancestor_of_unviable_is_not_leaf_if_has_children() {
|
||||
|
||||
import_blocks_into(&mut virtual_overseer, &backend, None, chain_b.clone()).await;
|
||||
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![a2_hash, b2_hash]);
|
||||
|
||||
import_blocks_into(&mut virtual_overseer, &backend, None, chain_a_ext.clone()).await;
|
||||
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a_ext.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a_ext.iter().map(|(h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![b2_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![b2_hash]).await;
|
||||
|
||||
@@ -995,7 +995,7 @@ fn self_and_future_reversions_are_ignored() {
|
||||
)
|
||||
.await;
|
||||
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![a3_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![a3_hash]).await;
|
||||
|
||||
@@ -1028,7 +1028,7 @@ fn revert_finalized_is_ignored() {
|
||||
)
|
||||
.await;
|
||||
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![a3_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![a3_hash]).await;
|
||||
|
||||
@@ -1072,8 +1072,8 @@ fn reversion_affects_viability_of_all_subtrees() {
|
||||
|
||||
import_blocks_into(&mut virtual_overseer, &backend, None, chain_b.clone()).await;
|
||||
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, chain_a.iter().map(|(h, _)| h));
|
||||
assert_backend_contains(&backend, chain_b.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![a1_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![a1_hash]).await;
|
||||
|
||||
@@ -2034,12 +2034,12 @@ fn revert_blocks_message_triggers_proper_reversion() {
|
||||
.await;
|
||||
|
||||
// Checking mini chain
|
||||
assert_backend_contains(&backend, built_chain.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, built_chain.iter().map(|(h, _)| h));
|
||||
assert_leaves(&backend, vec![head_hash]);
|
||||
assert_leaves_query(&mut virtual_overseer, vec![head_hash]).await;
|
||||
|
||||
let block_1_hash = backend.load_blocks_by_number(1).unwrap().get(0).unwrap().clone();
|
||||
let block_2_hash = backend.load_blocks_by_number(2).unwrap().get(0).unwrap().clone();
|
||||
let block_1_hash = *backend.load_blocks_by_number(1).unwrap().get(0).unwrap();
|
||||
let block_2_hash = *backend.load_blocks_by_number(2).unwrap().get(0).unwrap();
|
||||
|
||||
// Sending revert blocks message
|
||||
let (_, write_rx) = backend.await_next_write();
|
||||
@@ -2098,7 +2098,7 @@ fn revert_blocks_against_finalized_is_ignored() {
|
||||
.await;
|
||||
|
||||
// Checking mini chain
|
||||
assert_backend_contains(&backend, built_chain.iter().map(|&(ref h, _)| h));
|
||||
assert_backend_contains(&backend, built_chain.iter().map(|(h, _)| h));
|
||||
|
||||
// Sending dispute concluded against message
|
||||
virtual_overseer
|
||||
|
||||
@@ -44,7 +44,7 @@ fn make_dummy_comparator(
|
||||
fn clone_request(request: &ParticipationRequest) -> ParticipationRequest {
|
||||
ParticipationRequest {
|
||||
candidate_receipt: request.candidate_receipt.clone(),
|
||||
candidate_hash: request.candidate_hash.clone(),
|
||||
candidate_hash: request.candidate_hash,
|
||||
session: request.session,
|
||||
request_timer: None,
|
||||
}
|
||||
|
||||
@@ -399,10 +399,10 @@ impl TestState {
|
||||
let mut response = Vec::new();
|
||||
for i in target_header.number.saturating_sub(k as u32)..target_header.number {
|
||||
response.push(
|
||||
self.block_num_to_header
|
||||
*self
|
||||
.block_num_to_header
|
||||
.get(&i)
|
||||
.expect("headers and block_num_to_header should always be in sync")
|
||||
.clone(),
|
||||
.expect("headers and block_num_to_header should always be in sync"),
|
||||
);
|
||||
}
|
||||
let _ = response_channel.send(Ok(response));
|
||||
@@ -552,7 +552,7 @@ impl TestState {
|
||||
let (ctx, ctx_handle) = make_buffered_subsystem_context(TaskExecutor::new(), 1);
|
||||
let subsystem = DisputeCoordinatorSubsystem::new(
|
||||
self.db.clone(),
|
||||
self.config.clone(),
|
||||
self.config,
|
||||
self.subsystem_keystore.clone(),
|
||||
Metrics::default(),
|
||||
);
|
||||
@@ -574,27 +574,27 @@ where
|
||||
|
||||
// Add two more blocks after the genesis (which is created in `default()`)
|
||||
let h1 = Header {
|
||||
parent_hash: test_state.last_block.clone(),
|
||||
parent_hash: test_state.last_block,
|
||||
number: 1,
|
||||
digest: dummy_digest(),
|
||||
state_root: dummy_hash(),
|
||||
extrinsics_root: dummy_hash(),
|
||||
};
|
||||
let h1_hash = h1.hash();
|
||||
test_state.headers.insert(h1_hash.clone(), h1);
|
||||
test_state.block_num_to_header.insert(1, h1_hash.clone());
|
||||
test_state.headers.insert(h1_hash, h1);
|
||||
test_state.block_num_to_header.insert(1, h1_hash);
|
||||
test_state.last_block = h1_hash;
|
||||
|
||||
let h2 = Header {
|
||||
parent_hash: test_state.last_block.clone(),
|
||||
parent_hash: test_state.last_block,
|
||||
number: 2,
|
||||
digest: dummy_digest(),
|
||||
state_root: dummy_hash(),
|
||||
extrinsics_root: dummy_hash(),
|
||||
};
|
||||
let h2_hash = h2.hash();
|
||||
test_state.headers.insert(h2_hash.clone(), h2);
|
||||
test_state.block_num_to_header.insert(2, h2_hash.clone());
|
||||
test_state.headers.insert(h2_hash, h2);
|
||||
test_state.block_num_to_header.insert(2, h2_hash);
|
||||
test_state.last_block = h2_hash;
|
||||
|
||||
test_state.resume(test)
|
||||
@@ -3133,7 +3133,7 @@ fn participation_requests_reprioritized_for_newly_included() {
|
||||
// participation.
|
||||
let parent_block_num: BlockNumber = repetition as BlockNumber - 1;
|
||||
candidate_receipt.descriptor.relay_parent =
|
||||
test_state.block_num_to_header.get(&parent_block_num).unwrap().clone();
|
||||
*test_state.block_num_to_header.get(&parent_block_num).unwrap();
|
||||
receipts.push(candidate_receipt.clone());
|
||||
}
|
||||
|
||||
|
||||
@@ -136,16 +136,16 @@ fn partitioning_happy_case() {
|
||||
CandidateHash(Hash::random()),
|
||||
DisputeStatus::ConcludedFor(time_now - ACTIVE_DURATION_SECS * 2),
|
||||
);
|
||||
input.push(inactive_unknown_onchain.clone());
|
||||
input.push(inactive_unknown_onchain);
|
||||
|
||||
let inactive_unconcluded_onchain = (
|
||||
1,
|
||||
CandidateHash(Hash::random()),
|
||||
DisputeStatus::ConcludedFor(time_now - ACTIVE_DURATION_SECS * 2),
|
||||
);
|
||||
input.push(inactive_unconcluded_onchain.clone());
|
||||
input.push(inactive_unconcluded_onchain);
|
||||
onchain.insert(
|
||||
(inactive_unconcluded_onchain.0, inactive_unconcluded_onchain.1.clone()),
|
||||
(inactive_unconcluded_onchain.0, inactive_unconcluded_onchain.1),
|
||||
DisputeState {
|
||||
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 0, 0, 0, 0, 0, 0],
|
||||
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
@@ -155,12 +155,12 @@ fn partitioning_happy_case() {
|
||||
);
|
||||
|
||||
let active_unknown_onchain = (2, CandidateHash(Hash::random()), DisputeStatus::Active);
|
||||
input.push(active_unknown_onchain.clone());
|
||||
input.push(active_unknown_onchain);
|
||||
|
||||
let active_unconcluded_onchain = (3, CandidateHash(Hash::random()), DisputeStatus::Active);
|
||||
input.push(active_unconcluded_onchain.clone());
|
||||
input.push(active_unconcluded_onchain);
|
||||
onchain.insert(
|
||||
(active_unconcluded_onchain.0, active_unconcluded_onchain.1.clone()),
|
||||
(active_unconcluded_onchain.0, active_unconcluded_onchain.1),
|
||||
DisputeState {
|
||||
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 0, 0, 0, 0, 0, 0],
|
||||
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
@@ -170,9 +170,9 @@ fn partitioning_happy_case() {
|
||||
);
|
||||
|
||||
let active_concluded_onchain = (4, CandidateHash(Hash::random()), DisputeStatus::Active);
|
||||
input.push(active_concluded_onchain.clone());
|
||||
input.push(active_concluded_onchain);
|
||||
onchain.insert(
|
||||
(active_concluded_onchain.0, active_concluded_onchain.1.clone()),
|
||||
(active_concluded_onchain.0, active_concluded_onchain.1),
|
||||
DisputeState {
|
||||
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 1, 0],
|
||||
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
@@ -186,9 +186,9 @@ fn partitioning_happy_case() {
|
||||
CandidateHash(Hash::random()),
|
||||
DisputeStatus::ConcludedFor(time_now - ACTIVE_DURATION_SECS * 2),
|
||||
);
|
||||
input.push(inactive_concluded_onchain.clone());
|
||||
input.push(inactive_concluded_onchain);
|
||||
onchain.insert(
|
||||
(inactive_concluded_onchain.0, inactive_concluded_onchain.1.clone()),
|
||||
(inactive_concluded_onchain.0, inactive_concluded_onchain.1),
|
||||
DisputeState {
|
||||
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 0, 0],
|
||||
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
@@ -254,10 +254,10 @@ fn partitioning_doubled_onchain_vote() {
|
||||
// Dispute B has supermajority + 1 votes, so the doubled onchain vote doesn't affect it. It
|
||||
// should be considered as 'can conclude onchain'.
|
||||
let dispute_b = (4, CandidateHash(Hash::random()), DisputeStatus::Active);
|
||||
input.push(dispute_a.clone());
|
||||
input.push(dispute_b.clone());
|
||||
input.push(dispute_a);
|
||||
input.push(dispute_b);
|
||||
onchain.insert(
|
||||
(dispute_a.0, dispute_a.1.clone()),
|
||||
(dispute_a.0, dispute_a.1),
|
||||
DisputeState {
|
||||
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 0, 0],
|
||||
validators_against: bitvec![u8, Lsb0; 1, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
@@ -266,7 +266,7 @@ fn partitioning_doubled_onchain_vote() {
|
||||
},
|
||||
);
|
||||
onchain.insert(
|
||||
(dispute_b.0, dispute_b.1.clone()),
|
||||
(dispute_b.0, dispute_b.1),
|
||||
DisputeState {
|
||||
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 1, 1, 1, 1, 1, 0],
|
||||
validators_against: bitvec![u8, Lsb0; 1, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
@@ -287,10 +287,10 @@ fn partitioning_duplicated_dispute() {
|
||||
let mut onchain = HashMap::<(u32, CandidateHash), DisputeState>::new();
|
||||
|
||||
let some_dispute = (3, CandidateHash(Hash::random()), DisputeStatus::Active);
|
||||
input.push(some_dispute.clone());
|
||||
input.push(some_dispute.clone());
|
||||
input.push(some_dispute);
|
||||
input.push(some_dispute);
|
||||
onchain.insert(
|
||||
(some_dispute.0, some_dispute.1.clone()),
|
||||
(some_dispute.0, some_dispute.1),
|
||||
DisputeState {
|
||||
validators_for: bitvec![u8, Lsb0; 1, 1, 1, 0, 0, 0, 0, 0, 0],
|
||||
validators_against: bitvec![u8, Lsb0; 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
@@ -385,7 +385,7 @@ impl TestDisputes {
|
||||
local_votes_count: usize,
|
||||
dummy_receipt: CandidateReceipt,
|
||||
) {
|
||||
self.local_disputes.push(dispute.clone());
|
||||
self.local_disputes.push(dispute);
|
||||
self.votes_db.insert(
|
||||
(dispute.0, dispute.1),
|
||||
CandidateVotes {
|
||||
@@ -412,7 +412,7 @@ impl TestDisputes {
|
||||
DisputeStatus::ConcludedAgainst(_) | DisputeStatus::ConcludedFor(_) => Some(1),
|
||||
};
|
||||
self.onchain_disputes.insert(
|
||||
(dispute.0, dispute.1.clone()),
|
||||
(dispute.0, dispute.1),
|
||||
DisputeState {
|
||||
validators_for: TestDisputes::generate_bitvec(
|
||||
self.validators_count,
|
||||
@@ -434,10 +434,10 @@ impl TestDisputes {
|
||||
let onchain_votes_count = self.validators_count * 80 / 100;
|
||||
let session_idx = 0;
|
||||
let lf = leaf();
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
|
||||
for _ in 0..dispute_count {
|
||||
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
|
||||
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
|
||||
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
|
||||
self.add_onchain_dispute(d, onchain_votes_count);
|
||||
}
|
||||
|
||||
@@ -452,10 +452,10 @@ impl TestDisputes {
|
||||
let onchain_votes_count = self.validators_count * 40 / 100;
|
||||
let session_idx = 1;
|
||||
let lf = leaf();
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
|
||||
for _ in 0..dispute_count {
|
||||
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
|
||||
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
|
||||
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
|
||||
self.add_onchain_dispute(d, onchain_votes_count);
|
||||
}
|
||||
|
||||
@@ -469,10 +469,10 @@ impl TestDisputes {
|
||||
let local_votes_count = self.validators_count * 90 / 100;
|
||||
let session_idx = 2;
|
||||
let lf = leaf();
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
|
||||
for _ in 0..dispute_count {
|
||||
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Confirmed);
|
||||
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
|
||||
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
|
||||
}
|
||||
(session_idx, local_votes_count * dispute_count)
|
||||
}
|
||||
@@ -485,10 +485,10 @@ impl TestDisputes {
|
||||
let onchain_votes_count = self.validators_count * 75 / 100;
|
||||
let session_idx = 3;
|
||||
let lf = leaf();
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
|
||||
for _ in 0..dispute_count {
|
||||
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::ConcludedFor(0));
|
||||
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
|
||||
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
|
||||
self.add_onchain_dispute(d, onchain_votes_count);
|
||||
}
|
||||
(session_idx, (local_votes_count - onchain_votes_count) * dispute_count)
|
||||
@@ -501,10 +501,10 @@ impl TestDisputes {
|
||||
let local_votes_count = self.validators_count * 90 / 100;
|
||||
let session_idx = 4;
|
||||
let lf = leaf();
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
|
||||
for _ in 0..dispute_count {
|
||||
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::ConcludedFor(0));
|
||||
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
|
||||
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
|
||||
}
|
||||
(session_idx, local_votes_count * dispute_count)
|
||||
}
|
||||
@@ -517,10 +517,10 @@ impl TestDisputes {
|
||||
let onchain_votes_count = self.validators_count * 10 / 100;
|
||||
let session_idx = 5;
|
||||
let lf = leaf();
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
|
||||
for _ in 0..dispute_count {
|
||||
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
|
||||
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
|
||||
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
|
||||
self.add_onchain_dispute(d, onchain_votes_count);
|
||||
}
|
||||
|
||||
@@ -534,10 +534,10 @@ impl TestDisputes {
|
||||
let local_votes_count = self.validators_count * 10 / 100;
|
||||
let session_idx = 6;
|
||||
let lf = leaf();
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash.clone());
|
||||
let dummy_receipt = test_helpers::dummy_candidate_receipt(lf.hash);
|
||||
for _ in 0..dispute_count {
|
||||
let d = (session_idx, CandidateHash(Hash::random()), DisputeStatus::Active);
|
||||
self.add_offchain_dispute(d.clone(), local_votes_count, dummy_receipt.clone());
|
||||
self.add_offchain_dispute(d, local_votes_count, dummy_receipt.clone());
|
||||
}
|
||||
|
||||
(session_idx, local_votes_count * dispute_count)
|
||||
|
||||
@@ -188,7 +188,7 @@ impl TestState {
|
||||
|
||||
let activated = if let Some(activated_leaf) = fake_leaf {
|
||||
self.leaves.insert(
|
||||
activated_leaf.block_hash.clone(),
|
||||
activated_leaf.block_hash,
|
||||
LeafState {
|
||||
session_index: self.last_session_index,
|
||||
pvfs: activated_leaf.pvfs.clone(),
|
||||
@@ -497,9 +497,9 @@ fn reactivating_pvf_leads_to_second_check() {
|
||||
test_harness(|mut test_state, mut handle| {
|
||||
async move {
|
||||
let pvf = dummy_validation_code_hash(1);
|
||||
let block_1 = FakeLeaf::new(dummy_hash(), 1, vec![pvf.clone()]);
|
||||
let block_1 = FakeLeaf::new(dummy_hash(), 1, vec![pvf]);
|
||||
let block_2 = block_1.descendant(vec![]);
|
||||
let block_3 = block_2.descendant(vec![pvf.clone()]);
|
||||
let block_3 = block_2.descendant(vec![pvf]);
|
||||
|
||||
test_state
|
||||
.activate_leaf_with_session(
|
||||
@@ -552,9 +552,9 @@ fn dont_double_vote_for_pvfs_in_view() {
|
||||
test_harness(|mut test_state, mut handle| {
|
||||
async move {
|
||||
let pvf = dummy_validation_code_hash(1);
|
||||
let block_1_1 = FakeLeaf::new([1; 32].into(), 1, vec![pvf.clone()]);
|
||||
let block_2_1 = FakeLeaf::new([2; 32].into(), 1, vec![pvf.clone()]);
|
||||
let block_1_2 = block_1_1.descendant(vec![pvf.clone()]);
|
||||
let block_1_1 = FakeLeaf::new([1; 32].into(), 1, vec![pvf]);
|
||||
let block_2_1 = FakeLeaf::new([2; 32].into(), 1, vec![pvf]);
|
||||
let block_1_2 = block_1_1.descendant(vec![pvf]);
|
||||
|
||||
test_state
|
||||
.activate_leaf_with_session(
|
||||
@@ -605,8 +605,8 @@ fn judgements_come_out_of_order() {
|
||||
let pvf_1 = dummy_validation_code_hash(1);
|
||||
let pvf_2 = dummy_validation_code_hash(2);
|
||||
|
||||
let block_1 = FakeLeaf::new([1; 32].into(), 1, vec![pvf_1.clone()]);
|
||||
let block_2 = FakeLeaf::new([2; 32].into(), 1, vec![pvf_2.clone()]);
|
||||
let block_1 = FakeLeaf::new([1; 32].into(), 1, vec![pvf_1]);
|
||||
let block_2 = FakeLeaf::new([2; 32].into(), 1, vec![pvf_2]);
|
||||
|
||||
test_state
|
||||
.activate_leaf_with_session(
|
||||
|
||||
@@ -53,14 +53,14 @@ async fn execute_good_block_on_parent() {
|
||||
|
||||
#[tokio::test]
|
||||
async fn execute_good_chain_on_parent() {
|
||||
let mut number = 0;
|
||||
let mut parent_hash = [0; 32];
|
||||
let mut last_state = 0;
|
||||
|
||||
let host = TestHost::new();
|
||||
|
||||
for add in 0..10 {
|
||||
let parent_head = HeadData { number, parent_hash, post_state: hash_state(last_state) };
|
||||
for (number, add) in (0..10).enumerate() {
|
||||
let parent_head =
|
||||
HeadData { number: number as u64, parent_hash, post_state: hash_state(last_state) };
|
||||
|
||||
let block_data = BlockData { state: last_state, add };
|
||||
|
||||
@@ -80,11 +80,10 @@ async fn execute_good_chain_on_parent() {
|
||||
|
||||
let new_head = HeadData::decode(&mut &ret.head_data.0[..]).unwrap();
|
||||
|
||||
assert_eq!(new_head.number, number + 1);
|
||||
assert_eq!(new_head.number, number as u64 + 1);
|
||||
assert_eq!(new_head.parent_hash, parent_head.hash());
|
||||
assert_eq!(new_head.post_state, hash_state(last_state + add));
|
||||
|
||||
number += 1;
|
||||
parent_hash = new_head.hash();
|
||||
last_state += add;
|
||||
}
|
||||
|
||||
@@ -984,7 +984,7 @@ fn requests_submit_pvf_check_statement() {
|
||||
),
|
||||
})
|
||||
.await;
|
||||
assert_eq!(rx.await.unwrap().unwrap(), ());
|
||||
let _ = rx.await.unwrap().unwrap();
|
||||
let (tx, rx) = oneshot::channel();
|
||||
ctx_handle
|
||||
.send(FromOrchestra::Communication {
|
||||
@@ -994,7 +994,7 @@ fn requests_submit_pvf_check_statement() {
|
||||
),
|
||||
})
|
||||
.await;
|
||||
assert_eq!(rx.await.unwrap().unwrap(), ());
|
||||
let _ = rx.await.unwrap().unwrap();
|
||||
|
||||
assert_eq!(
|
||||
&*subsystem_client.submitted_pvf_check_statement.lock().expect("poisened mutex"),
|
||||
@@ -1061,9 +1061,7 @@ fn requests_validation_code_hash() {
|
||||
let validation_code_hash = dummy_validation_code().hash();
|
||||
|
||||
let mut subsystem_client = MockSubsystemClient::default();
|
||||
subsystem_client
|
||||
.validation_code_hash
|
||||
.insert(para_a, validation_code_hash.clone());
|
||||
subsystem_client.validation_code_hash.insert(para_a, validation_code_hash);
|
||||
let subsystem_client = Arc::new(subsystem_client);
|
||||
|
||||
let subsystem =
|
||||
|
||||
Reference in New Issue
Block a user