Skip to content
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

Improve CI #648

Merged
merged 12 commits into from
May 11, 2022
+63 −88
Merged

Improve CI #648

Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f472ecd
Improve CI
koushiro Apr 27, 2022
c34151d
Merge remote-tracking branch 'upstream/master' into improve-ci
koushiro Apr 29, 2022
27e5d4b
Use nightly-2022-05-02
koushiro May 5, 2022
adb9cd7
Remove useless submodule
koushiro May 5, 2022
a31226a
Make test more stable
koushiro May 5, 2022
d432223
Merge remote-tracking branch 'upstream/master' into make-test-stable
koushiro May 9, 2022
7883982
Merge remote-tracking branch 'upstream/master' into improve-ci
koushiro May 9, 2022
3a65dc1
Some nits
koushiro May 9, 2022
e0ef607
Merge branch 'make-test-stable' into improve-ci
koushiro May 9, 2022
b231c11
Merge remote-tracking branch 'upstream/master' into improve-ci
koushiro May 10, 2022
13e6fe2
remove strategy
koushiro May 11, 2022
195a9a9
Merge remote-tracking branch 'upstream/master' into improve-ci
koushiro May 11, 2022
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
26 changes: 13 additions & 13 deletions client/rpc/src/eth/cache/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ mod tests {
executor::block_on(client.import(BlockOrigin::Own, a2)).unwrap();

// Give some time to consume and process the import notification stream.
thread::sleep(time::Duration::from_millis(1));
thread::sleep(time::Duration::from_millis(100));

// Expect: genesis with schema V1, A2 with schema V2.
assert_eq!(
Expand Down Expand Up @@ -203,7 +203,7 @@ mod tests {
executor::block_on(client.import(BlockOrigin::Own, b3)).unwrap();

// Give some time to consume and process the import notification stream.
thread::sleep(time::Duration::from_millis(1));
thread::sleep(time::Duration::from_millis(100));

// Expect: A2 to be retracted, genesis with schema V1, B3 with schema V2.
assert_eq!(
Expand All @@ -230,7 +230,7 @@ mod tests {
executor::block_on(client.import(BlockOrigin::Own, c2)).unwrap();

// Give some time to consume and process the import notification stream.
thread::sleep(time::Duration::from_millis(1));
thread::sleep(time::Duration::from_millis(100));

// Expect: genesis with schema V1, B3 still with schema V2.
// C2 still not best block and not cached.
Expand All @@ -243,28 +243,28 @@ mod tests {
);

// Make C2 branch the longest chain.
// C2 -> D2
// C2 -> C3
let mut builder = client
.new_block_at(&BlockId::Hash(c2_hash), Default::default(), false)
.unwrap();
builder.push_storage_change(vec![2], None).unwrap();
let d2 = builder.build().unwrap().block;
let d2_hash = d2.header.hash();
executor::block_on(client.import(BlockOrigin::Own, d2)).unwrap();
let c3 = builder.build().unwrap().block;
let c3_hash = c3.header.hash();
executor::block_on(client.import(BlockOrigin::Own, c3)).unwrap();

// D2 -> E2
// C3 -> C4
let mut builder = client
.new_block_at(&BlockId::Hash(d2_hash), Default::default(), false)
.new_block_at(&BlockId::Hash(c3_hash), Default::default(), false)
.unwrap();
builder.push_storage_change(vec![3], None).unwrap();
let e2 = builder.build().unwrap().block;
executor::block_on(client.import(BlockOrigin::Own, e2)).unwrap();
let c4 = builder.build().unwrap().block;
executor::block_on(client.import(BlockOrigin::Own, c4)).unwrap();

// Give some time to consume and process the import notification stream.
thread::sleep(time::Duration::from_millis(1));
thread::sleep(time::Duration::from_millis(100));

// Expect: B2 branch to be retracted, genesis with schema V1, C2 with schema V2.
// E2 became new best, chain reorged, we expect the C2 ancestor to be cached.
// C4 became new best, chain reorged, we expect the C2 ancestor to be cached.
assert_eq!(
frontier_backend_client::load_cached_schema::<_>(frontier_backend.as_ref()),
Ok(Some(vec![
Expand Down