Change order of where to find rpc auth

[ldk-sample] / src / args.rs

diff --git a/src/args.rs b/src/args.rs
index deb1704109eac1a390cdad541775f0d89dec833c..a9d1729b3af75f9898a7e984c8403937ab5956df 100644 (file)
--- a/src/args.rs
+++ b/src/args.rs
@@ -55,9 +55,9 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
        };
 
        let (bitcoind_rpc_username, bitcoind_rpc_password) = if bitcoind_rpc_info_parts.len() == 1 {
-               get_rpc_auth_from_cookie(None, Some(network), None)
+               get_rpc_auth_from_env_vars()
                        .or(get_rpc_auth_from_env_file(None))
-                       .or(get_rpc_auth_from_env_vars())
+                       .or(get_rpc_auth_from_cookie(None, Some(network), None))
                        .or({
                                println!("ERROR: unable to get bitcoind RPC username and password");
                                print_rpc_auth_help();
@@ -175,7 +175,7 @@ fn get_cookie_path(
        };
 
        let data_dir_path_with_net = match network {
-               Some(Network::Testnet) => data_dir_path.join("testnet"),
+               Some(Network::Testnet) => data_dir_path.join("testnet3"),
                Some(Network::Regtest) => data_dir_path.join("regtest"),
                Some(Network::Signet) => data_dir_path.join("signet"),
                _ => data_dir_path,
@@ -279,7 +279,7 @@ mod rpc_auth_tests {
                                Some((TEST_DATA_DIR, true)),
                                Some(Network::Testnet),
                                None,
-                               env::home_dir().unwrap().join(TEST_DATA_DIR).join("testnet").join(".cookie"),
+                               env::home_dir().unwrap().join(TEST_DATA_DIR).join("testnet3").join(".cookie"),
                        ),
                        (
                                Some((TEST_DATA_DIR, false)),