Skip to content

fix(tests): fix failing tests due to RICK/MORTY #1970

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

Merged
shamardy merged 2 commits into from
Sep 18, 2023
+20 −14
Merged

fix(tests): fix failing tests due to RICK/MORTY #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a121dd
check if using doc/marty electrums fixes ci wasm tests
shamardy Sep 18, 2023
cc921c7
use doc electrums for test_utxo_lock
shamardy Sep 18, 2023
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
4 changes: 2 additions & 2 deletions mm2src/coins/utxo/utxo_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ use futures::future::join_all;
use futures::TryFutureExt;
use mm2_core::mm_ctx::MmCtxBuilder;
use mm2_number::bigdecimal::{BigDecimal, Signed};
use mm2_test_helpers::for_tests::{mm_ctx_with_custom_db, MORTY_ELECTRUM_ADDRS, RICK_ELECTRUM_ADDRS};
use mm2_test_helpers::for_tests::{mm_ctx_with_custom_db, DOC_ELECTRUM_ADDRS, MORTY_ELECTRUM_ADDRS, RICK_ELECTRUM_ADDRS};
use mocktopus::mocking::*;
use rpc::v1::types::H256 as H256Json;
use serialization::{deserialize, CoinVariant};
Expand Down Expand Up @@ -953,7 +953,7 @@ fn test_withdraw_rick_rewards_none() {
#[test]
fn test_utxo_lock() {
// send several transactions concurrently to check that they are not using same inputs
let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
let client = electrum_client_for_test(DOC_ELECTRUM_ADDRS);
let coin = utxo_coin_for_test(client.into(), None, false);
let output = TransactionOutput {
value: 1000000,
Expand Down
24 changes: 12 additions & 12 deletions mm2src/mm2_test_helpers/src/electrums.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,38 @@ use serde_json::{json, Value as Json};
#[cfg(target_arch = "wasm32")]
pub fn rick_electrums() -> Vec<Json> {
vec![
json!({ "url": "electrum1.cipig.net:30017", "protocol": "WSS" }),
json!({ "url": "electrum2.cipig.net:30017", "protocol": "WSS" }),
json!({ "url": "electrum3.cipig.net:30017", "protocol": "WSS" }),
json!({ "url": "electrum1.cipig.net:30020", "protocol": "WSS" }),
json!({ "url": "electrum2.cipig.net:30020", "protocol": "WSS" }),
json!({ "url": "electrum3.cipig.net:30020", "protocol": "WSS" }),
]
}

#[cfg(not(target_arch = "wasm32"))]
pub fn rick_electrums() -> Vec<Json> {
vec![
json!({ "url": "electrum1.cipig.net:10017" }),
json!({ "url": "electrum2.cipig.net:10017" }),
json!({ "url": "electrum3.cipig.net:10017" }),
json!({ "url": "electrum1.cipig.net:10020" }),
json!({ "url": "electrum2.cipig.net:10020" }),
json!({ "url": "electrum3.cipig.net:10020" }),
]
}

#[allow(dead_code)]
#[cfg(target_arch = "wasm32")]
pub fn morty_electrums() -> Vec<Json> {
vec![
json!({ "url": "electrum1.cipig.net:30018", "protocol": "WSS" }),
json!({ "url": "electrum2.cipig.net:30018", "protocol": "WSS" }),
json!({ "url": "electrum3.cipig.net:30018", "protocol": "WSS" }),
json!({ "url": "electrum1.cipig.net:30021", "protocol": "WSS" }),
json!({ "url": "electrum2.cipig.net:30021", "protocol": "WSS" }),
json!({ "url": "electrum3.cipig.net:30021", "protocol": "WSS" }),
]
}

#[allow(dead_code)]
#[cfg(not(target_arch = "wasm32"))]
pub fn morty_electrums() -> Vec<Json> {
vec![
json!({ "url": "electrum1.cipig.net:10018" }),
json!({ "url": "electrum2.cipig.net:10018" }),
json!({ "url": "electrum3.cipig.net:10018" }),
json!({ "url": "electrum1.cipig.net:10021" }),
json!({ "url": "electrum2.cipig.net:10021" }),
json!({ "url": "electrum3.cipig.net:10021" }),
]
}

Expand Down
6 changes: 6 additions & 0 deletions mm2src/mm2_test_helpers/src/for_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ pub const MORTY_ELECTRUM_ADDRS: &[&str] = &[
"electrum2.cipig.net:10018",
"electrum3.cipig.net:10018",
];
pub const DOC: &str = "DOC";
pub const DOC_ELECTRUM_ADDRS: &[&str] = &[
"electrum1.cipig.net:10020",
"electrum2.cipig.net:10020",
"electrum3.cipig.net:10020",
];
pub const ZOMBIE_TICKER: &str = "ZOMBIE";
pub const ARRR: &str = "ARRR";
pub const ZOMBIE_ELECTRUMS: &[&str] = &[
Expand Down