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

Remove dupe storage item if we get one back, to be compatible with Smoldot + legacy RPCs #1534

Merged
merged 2 commits into from
Apr 15, 2024
+12 −2
Merged

Remove dupe storage item if we get one back, to be compatible with Smoldot + legacy RPCs #1534

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec3a2de
Remove dupe storage item if we get one back, to be compatibel with Sm…
jsdw Apr 15, 2024
2ccaee2
remove commented-out code
jsdw Apr 15, 2024
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
14 changes: 12 additions & 2 deletions subxt/src/backend/legacy/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,17 @@ impl<T: Config> Stream for StorageFetchDescendantKeysStream<T> {
};

match keys {
Ok(keys) => {
Ok(mut keys) => {
if this.pagination_start_key.is_some()
&& keys.first() == this.pagination_start_key.as_ref()
{
// Currently, Smoldot returns the "start key" as the first key in the input
// (see https://github.com/smol-dot/smoldot/issues/1692), whereas Substrate doesn't.
// We don't expect the start key to be returned either (since it was the last key of prev
// iteration), so remove it if we see it. This `remove()` method isn't very efficient but
// this will be a non issue with the RPC V2 APIs or if Smoldot aligns with Substrate anyway.
keys.remove(0);
}
if keys.is_empty() {
// No keys left; we're done!
this.done = true;
Expand All @@ -428,7 +438,7 @@ impl<T: Config> Stream for StorageFetchDescendantKeysStream<T> {
let key = this.key.clone();
let at = this.at;
let storage_page_size = this.storage_page_size;
let pagination_start_key = this.pagination_start_key.take();
let pagination_start_key = this.pagination_start_key.clone();
let keys_fut = async move {
methods
.state_get_keys_paged(
Expand Down
Loading