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

Simplify the chain_head.rs module #409

Merged
merged 17 commits into from
Apr 12, 2023
Merged

Simplify the chain_head.rs module #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4d7dce6
Move the chainhead_follow task to another function
tomaka Apr 11, 2023
7eeddb6
Merge FollowSubscription into ChainHeadFollowTask
tomaka Apr 11, 2023
58445ef
Extract processing foreground message to separate function
tomaka Apr 11, 2023
2d5bd41
Move the subscription start functions as methods of ChainHeadFollowTask
tomaka Apr 11, 2023
07cc14f
Fix generating a `chainHead_unstable_followEvent` event on unfollow
tomaka Apr 11, 2023
975090c
Fix cyclic references in the chainHead sub-tasks
tomaka Apr 11, 2023
980c7e5
Finish fixing cyclic references issues
tomaka Apr 11, 2023
1655f9b
Move some fields to the struct
tomaka Apr 11, 2023
1576505
Move subscription as a struct field
tomaka Apr 11, 2023
dd013e8
PR link
tomaka Apr 11, 2023
c06f8a3
Merge branch 'main' into refactor-chain-head
tomaka Apr 11, 2023
612a253
CHANGELOG entry for cyclic reference
tomaka Apr 11, 2023
2b4e630
Remove CHANGELOG entry as still not fixed
tomaka Apr 11, 2023
3fc1b7d
Merge branch 'main' into refactor-chain-head
tomaka Apr 11, 2023
be48a4f
Properly fix cyclic reference
tomaka Apr 12, 2023
73aa325
Add back CHANGELOG entry
tomaka Apr 12, 2023
1a120ae
Oops, fix bug
tomaka Apr 12, 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
12 changes: 0 additions & 12 deletions light-base/src/json_rpc_service/background.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ use core::{
time::Duration,
};
use futures::{lock::Mutex, prelude::*};
use hashbrown::HashMap;
use smoldot::{
chain::fork_tree,
executor::{host, runtime_host},
header,
json_rpc::{self, methods, requests_subscriptions},
Expand Down Expand Up @@ -101,16 +99,6 @@ struct Background<TPlat: Platform> {
printed_legacy_json_rpc_warning: atomic::AtomicBool,
}

struct FollowSubscription {
/// Tree of hashes of all the current non-finalized blocks. This includes unpinned blocks.
non_finalized_blocks: fork_tree::ForkTree<[u8; 32]>,

/// For each pinned block hash, the SCALE-encoded header of the block.
pinned_blocks_headers: HashMap<[u8; 32], Vec<u8>, fnv::FnvBuildHasher>,

runtime_subscribe_all: Option<runtime_service::SubscriptionId>,
}

pub(super) enum SubscriptionMessage {
StopIfAllHeads {
stop_request_id: (String, requests_subscriptions::RequestId),
Expand Down
Loading