Account for Retry being handled internally

We recently dropped the `Retry` logic in `vss-client-ng`, and rather now
lean on `reqwest`'s retry logic. Here, we account for the corresponding
interface changes.

Author: tnull

Cargo.toml

@@ -66,7 +66,7 @@ serde_json = { version = "1.0.128", default-features = false, features = ["std"]
 log = { version = "0.4.22", default-features = false, features = ["std"]}
 
 #vss-client-ng = "0.3"
-vss-client-ng = { git = "https://github.com/tnull/vss-client", rev = "98ac5e171ef1ab970bbc58cd995ffc1e615421d1" }
+vss-client-ng = { git = "https://github.com/tnull/vss-client", rev = "e6d8e57a949bff3cf511aef258b7aa2c681e35c9" }
 prost = { version = "0.11.6", default-features = false}
 
 [target.'cfg(windows)'.dependencies]

src/builder.rs

@@ -732,7 +732,12 @@ impl NodeBuilder {
 		let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();
 
 		let vss_store =
-			VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
+			VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime))
+				.map_err(|e| {
+					log_error!(logger, "Failed to setup store: {}", e);
+					BuildError::KVStoreSetupFailed
+				})?;
+
 		build_with_store_internal(
 			config,
 			self.chain_data_source_config.as_ref(),

src/io/vss_store.rs

@@ -28,22 +28,11 @@ use vss_client_ng::types::{
 	Storable,
 };
 use vss_client_ng::util::key_obfuscator::KeyObfuscator;
-use vss_client_ng::util::retry::{
-	ExponentialBackoffRetryPolicy, FilteredRetryPolicy, JitteredRetryPolicy,
-	MaxAttemptsRetryPolicy, MaxTotalDelayRetryPolicy, RetryPolicy,
-};
 use vss_client_ng::util::storable_builder::{EntropySource, StorableBuilder};
 
 use crate::io::utils::check_namespace_key_validity;
 use crate::runtime::Runtime;
 
-type CustomRetryPolicy = FilteredRetryPolicy<
-	JitteredRetryPolicy<
-		MaxTotalDelayRetryPolicy<MaxAttemptsRetryPolicy<ExponentialBackoffRetryPolicy<VssError>>>,
-	>,
-	Box<dyn Fn(&VssError) -> bool + 'static + Send + Sync>,
->;
-
 // We set this to a small number of threads that would still allow to make some progress if one
 // would hit a blocking case
 const INTERNAL_RUNTIME_WORKERS: usize = 2;
@@ -69,8 +58,8 @@ impl VssStore {
 	pub(crate) fn new(
 		base_url: String, store_id: String, vss_seed: [u8; 32],
 		header_provider: Arc<dyn VssHeaderProvider>, runtime: Arc<Runtime>,
-	) -> Self {
-		let inner = Arc::new(VssStoreInner::new(base_url, store_id, vss_seed, header_provider));
+	) -> io::Result<Self> {
+		let inner = Arc::new(VssStoreInner::new(base_url, store_id, vss_seed, header_provider)?);
 		let next_version = AtomicU64::new(1);
 		let internal_runtime = Some(
 			tokio::runtime::Builder::new_multi_thread()
@@ -86,7 +75,7 @@ impl VssStore {
 				.unwrap(),
 		);
 
-		Self { inner, next_version, runtime, internal_runtime }
+		Ok(Self { inner, next_version, runtime, internal_runtime })
 	}
 
 	// Same logic as for the obfuscated keys below, but just for locking, using the plaintext keys
@@ -314,7 +303,7 @@ impl Drop for VssStore {
 }
 
 struct VssStoreInner {
-	client: VssClient<CustomRetryPolicy>,
+	client: VssClient,
 	store_id: String,
 	data_encryption_key: [u8; 32],
 	key_obfuscator: KeyObfuscator,
@@ -327,26 +316,16 @@ impl VssStoreInner {
 	pub(crate) fn new(
 		base_url: String, store_id: String, vss_seed: [u8; 32],
 		header_provider: Arc<dyn VssHeaderProvider>,
-	) -> Self {
+	) -> io::Result<Self> {
 		let (data_encryption_key, obfuscation_master_key) =
 			derive_data_encryption_and_obfuscation_keys(&vss_seed);
 		let key_obfuscator = KeyObfuscator::new(obfuscation_master_key);
-		let retry_policy = ExponentialBackoffRetryPolicy::new(Duration::from_millis(10))
-			.with_max_attempts(10)
-			.with_max_total_delay(Duration::from_secs(15))
-			.with_max_jitter(Duration::from_millis(10))
-			.skip_retry_on_error(Box::new(|e: &VssError| {
-				matches!(
-					e,
-					VssError::NoSuchKeyError(..)
-						| VssError::InvalidRequestError(..)
-						| VssError::ConflictError(..)
-				)
-			}) as _);
-
-		let client = VssClient::new_with_headers(base_url, retry_policy, header_provider);
+		let client = VssClient::new_with_headers(base_url, header_provider).map_err(|e| {
+			let msg = format!("Failed to setup VssClient: {}", e);
+			Error::new(ErrorKind::Other, msg)
+		})?;
 		let locks = Mutex::new(HashMap::new());
-		Self { client, store_id, data_encryption_key, key_obfuscator, locks }
+		Ok(Self { client, store_id, data_encryption_key, key_obfuscator, locks })
 	}
 
 	fn get_inner_lock_ref(&self, locking_key: String) -> Arc<tokio::sync::Mutex<u64>> {
@@ -631,7 +610,7 @@ mod tests {
 		let logger = Arc::new(Logger::new_log_facade());
 		let runtime = Arc::new(Runtime::new(logger).unwrap());
 		let vss_store =
-			VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime);
+			VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();
 
 		do_read_write_remove_list_persist(&vss_store);
 	}
@@ -647,7 +626,7 @@ mod tests {
 		let logger = Arc::new(Logger::new_log_facade());
 		let runtime = Arc::new(Runtime::new(logger).unwrap());
 		let vss_store =
-			VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime);
+			VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();
 
 		do_read_write_remove_list_persist(&vss_store);
 		drop(vss_store)