pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 05:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

system_syncState: Always return highest block (#11979)

Browse Source 
Before `highestBlock` was an optional that was omitted when it was `None`. We recently changed the
way the `highestBlock` is determined, this resulted in having this value in 99.99% of the time being
`None` when the node is syncing blocks at the tip. Now we always return a block for `highestBlock`.
If sync doesn't return us any best seen block, we return our own local best block as `highestBlock`.
This should mainly reflect the same behavior to before we changed the way the best seen block is determined.
This commit is contained in:
Bastian Köcher
2022-08-05 19:53:56 +02:00
committed by GitHub
parent a1ee0fca0b
commit a314484865
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/rpc-api/src/system/helpers.rs
+6 -6
View File
@@ -88,10 +88,10 @@ pub struct SyncState<Number> {
pub starting_block: Number, pub starting_block: Number,
/// Height of the current best block of the node. /// Height of the current best block of the node.
pub current_block: Number, pub current_block: Number,
/// Height of the highest block learned from the network. Missing if no block is known yet. /// Height of the highest block in the network.
#[serde(default = "Default::default", skip_serializing_if = "Option::is_none")] pub highest_block: Number,
pub highest_block: Option<Number>,
} }
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
@@ -129,7 +129,7 @@ mod tests {
::serde_json::to_string(&SyncState { ::serde_json::to_string(&SyncState {
starting_block: 12u32, starting_block: 12u32,
current_block: 50u32, current_block: 50u32,
highest_block: Some(128u32), highest_block: 128u32,
}) })
.unwrap(), .unwrap(),
r#"{"startingBlock":12,"currentBlock":50,"highestBlock":128}"#, r#"{"startingBlock":12,"currentBlock":50,"highestBlock":128}"#,
@@ -139,10 +139,10 @@ mod tests {
::serde_json::to_string(&SyncState { ::serde_json::to_string(&SyncState {
starting_block: 12u32, starting_block: 12u32,
current_block: 50u32, current_block: 50u32,
highest_block: None, highest_block: 50u32,
}) })
.unwrap(), .unwrap(),
r#"{"startingBlock":12,"currentBlock":50}"#, r#"{"startingBlock":12,"currentBlock":50,"highestBlock":50}"#,
); );
} }
} }
substrate/client/rpc/src/system/tests.rs
+2 -5
View File
@@ -123,7 +123,7 @@ fn api<T: Into<Option<Status>>>(sync: T) -> RpcModule<System<Block>> {
let _ = sender.send(SyncState { let _ = sender.send(SyncState {
starting_block: 1, starting_block: 1,
current_block: 2, current_block: 2,
highest_block: Some(3), highest_block: 3,
}); });
}, },
}; };
@@ -297,10 +297,7 @@ async fn system_node_roles() {
async fn system_sync_state() { async fn system_sync_state() {
let sync_state: SyncState<i32> = let sync_state: SyncState<i32> =
api(None).call("system_syncState", EmptyParams::new()).await.unwrap(); api(None).call("system_syncState", EmptyParams::new()).await.unwrap();
assert_eq!( assert_eq!(sync_state, SyncState { starting_block: 1, current_block: 2, highest_block: 3 });
sync_state,
SyncState { starting_block: 1, current_block: 2, highest_block: Some(3) }
);
} }
#[tokio::test] #[tokio::test]
substrate/client/service/src/lib.rs
+4 -2
View File
@@ -264,10 +264,12 @@ async fn build_network_future<
sc_rpc::system::Request::SyncState(sender) => { sc_rpc::system::Request::SyncState(sender) => {
use sc_rpc::system::SyncState; use sc_rpc::system::SyncState;
let best_number = client.info().best_number;
let _ = sender.send(SyncState { let _ = sender.send(SyncState {
starting_block, starting_block,
current_block: client.info().best_number, current_block: best_number,
highest_block: network.best_seen_block(), highest_block: network.best_seen_block().unwrap_or(best_number),
}); });
} }
} }