fixes for test issues

pendulum-chain · Nov 29, 2024 · 1f582d1 · 1f582d1
1 parent 4e521dd
commit 1f582d1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 25 deletions.
diff --git a/clients/vault/Cargo.toml b/clients/vault/Cargo.toml
@@ -78,8 +78,8 @@ tempdir.workspace = true
 runtime = { path = "../runtime", features = ["testing-utils", "standalone-metadata"] }
 wallet = { path = "../wallet", features = ["testing-utils"] }
 
-sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-keyring = { workspace = true, default-features = true }
+sp-arithmetic = { workspace = true, default-features = true }
 
 # Substrate dependencies
-frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+frame-support = { workspace = true, default-features = true }
diff --git a/clients/vault/resources/config/mainnet/stellar_relay_config_frankfurt.json b/clients/vault/resources/config/mainnet/stellar_relay_config_frankfurt.json
@@ -11,11 +11,6 @@
     "is_pub_net": true
   },
   "stellar_history_archive_urls": [
-    "http://history.stellar.org/prd/core-live/core_live_001",
-    "http://history.stellar.org/prd/core-live/core_live_002",
-    "http://history.stellar.org/prd/core-live/core_live_003",
-    "https://stellar-history-de-fra.satoshipay.io",
-    "https://stellar-history-sg-sin.satoshipay.io",
-    "https://stellar-history-us-iowa.satoshipay.io"
+    "https://hercules-history.publicnode.org"
   ]
 }
diff --git a/clients/vault/resources/config/mainnet/stellar_relay_config_iowa.json b/clients/vault/resources/config/mainnet/stellar_relay_config_iowa.json
@@ -11,11 +11,6 @@
     "is_pub_net": true
   },
   "stellar_history_archive_urls": [
-    "http://history.stellar.org/prd/core-live/core_live_001",
-    "http://history.stellar.org/prd/core-live/core_live_002",
-    "http://history.stellar.org/prd/core-live/core_live_003",
-    "https://stellar-history-de-fra.satoshipay.io",
-    "https://stellar-history-sg-sin.satoshipay.io",
-    "https://stellar-history-us-iowa.satoshipay.io"
+    "https://hercules-history.publicnode.org"
   ]
 }
diff --git a/clients/vault/resources/config/mainnet/stellar_relay_config_other.json b/clients/vault/resources/config/mainnet/stellar_relay_config_other.json
@@ -0,0 +1,16 @@
+{
+  "connection_info": {
+    "address": "37.27.162.12",
+    "port": 11625
+  },
+  "node_info": {
+    "ledger_version": 22,
+    "overlay_version": 35,
+    "overlay_min_version": 33,
+    "version_str": "stellar-core 22.0.0 (721fd0a654d5e82d38c748a91053e530a475193d)",
+    "is_pub_net": true
+  },
+  "stellar_history_archive_urls": [
+    "https://hercules-history.publicnode.org"
+  ]
+}
diff --git a/clients/vault/resources/config/mainnet/stellar_relay_config_singapore.json b/clients/vault/resources/config/mainnet/stellar_relay_config_singapore.json
@@ -11,11 +11,6 @@
     "is_pub_net": true
   },
   "stellar_history_archive_urls": [
-    "http://history.stellar.org/prd/core-live/core_live_001",
-    "http://history.stellar.org/prd/core-live/core_live_002",
-    "http://history.stellar.org/prd/core-live/core_live_003",
-    "https://stellar-history-de-fra.satoshipay.io",
-    "https://stellar-history-sg-sin.satoshipay.io",
-    "https://stellar-history-us-iowa.satoshipay.io"
+    "https://hercules-history.publicnode.org"
   ]
 }
diff --git a/clients/vault/src/oracle/testing_utils.rs b/clients/vault/src/oracle/testing_utils.rs
@@ -25,7 +25,8 @@ pub fn specific_stellar_relay_config(
 
 fn stellar_relay_config_choices(is_mainnet: bool) -> (Vec<&'static str>, &'static str) {
 	let node_points = if is_mainnet {
-		vec!["iowa", "singapore", "frankfurt"]
+		// vec!["iowa", "singapore", "frankfurt"]
+		vec!["other"] // temporarily force use this node, others seem to be overloaded
 	} else {
 		vec!["sdftest1", "sdftest2", "sdftest3"]
 	};

diff --git a/clients/wallet/src/horizon/responses.rs b/clients/wallet/src/horizon/responses.rs
@@ -202,8 +202,6 @@ pub struct TransactionResponse {
 	#[serde(deserialize_with = "de_str_to_bytes")]
 	pub result_xdr: Vec<u8>,
 	#[serde(deserialize_with = "de_str_to_bytes")]
-	pub result_meta_xdr: Vec<u8>,
-	#[serde(deserialize_with = "de_str_to_bytes")]
 	pub fee_meta_xdr: Vec<u8>,
 	#[serde(deserialize_with = "de_str_to_bytes")]
 	pub memo_type: Vec<u8>,
@@ -236,7 +234,6 @@ impl Debug for TransactionResponse {
 			.field("operation_count", &self.operation_count)
 			.field("envelope_xdr", &debug_str_or_vec_u8!(&self.envelope_xdr))
 			.field("result_xdr", &debug_str_or_vec_u8!(&self.result_xdr))
-			.field("result_meta_xdr", &debug_str_or_vec_u8!(&self.result_meta_xdr))
 			.field("memo_type", &debug_str_or_vec_u8!(&self.memo_type))
 			.field("memo", &memo)
 			.finish()