From ff2b178206f9952c3337638659450c67fd700e7e Mon Sep 17 00:00:00 2001
From: Liam Aharon <liam.aharon@hotmail.com>
Date: Thu, 25 Apr 2024 22:01:05 +1000
Subject: [PATCH] remote-externalities: retry get child keys query (#4280)
---
.../frame/remote-externalities/src/lib.rs | 29 ++++++++++---------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/substrate/utils/frame/remote-externalities/src/lib.rs b/substrate/utils/frame/remote-externalities/src/lib.rs
index e429d39669f..58cb901470c 100644
--- a/substrate/utils/frame/remote-externalities/src/lib.rs
+++ b/substrate/utils/frame/remote-externalities/src/lib.rs
@@ -830,19 +830,22 @@ where
child_prefix: StorageKey,
at: B::Hash,
) -> Result<Vec<StorageKey>, &'static str> {
- // This is deprecated and will generate a warning which causes the CI to fail.
- #[allow(warnings)]
- let child_keys = substrate_rpc_client::ChildStateApi::storage_keys(
- client,
- PrefixedStorageKey::new(prefixed_top_key.as_ref().to_vec()),
- child_prefix,
- Some(at),
- )
- .await
- .map_err(|e| {
- error!(target: LOG_TARGET, "Error = {:?}", e);
- "rpc child_get_keys failed."
- })?;
+ let retry_strategy =
+ FixedInterval::new(Self::KEYS_PAGE_RETRY_INTERVAL).take(Self::MAX_RETRIES);
+ let get_child_keys_closure = || {
+ #[allow(deprecated)]
+ substrate_rpc_client::ChildStateApi::storage_keys(
+ client,
+ PrefixedStorageKey::new(prefixed_top_key.as_ref().to_vec()),
+ child_prefix.clone(),
+ Some(at),
+ )
+ };
+ let child_keys =
+ Retry::spawn(retry_strategy, get_child_keys_closure).await.map_err(|e| {
+ error!(target: LOG_TARGET, "Error = {:?}", e);
+ "rpc child_get_keys failed."
+ })?;
debug!(
target: LOG_TARGET,
--
GitLab