Skip to content

Commit 1b91dd5

Browse files
committed
test: make tests windows compliant
1 parent f538eab commit 1b91dd5

File tree

1 file changed

+30
-21
lines changed

1 file changed

+30
-21
lines changed

testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3022,26 +3022,29 @@ mod tests {
30223022
}
30233023

30243024
#[test]
3025-
fn test_create_wallet_if_not_exists() {
3026-
let miner_seed = vec![1, 1, 1, 1];
3027-
let keychain = Keychain::default(miner_seed.clone());
3028-
let miner_pubkey = keychain.get_pub_key();
3029-
3025+
fn test_create_wallet_from_empty_name_default() {
30303026
let mut config = Config::default();
30313027
config.burnchain.magic_bytes = "T3".as_bytes().into();
3032-
config.burnchain.local_mining_public_key = Some(miner_pubkey.to_hex());
3033-
config.burnchain.username = Some("user".to_owned());
3034-
config.burnchain.password = Some("12345".to_owned());
3028+
config.burnchain.username = Some(String::from("user"));
3029+
config.burnchain.password = Some(String::from("12345"));
3030+
config.burnchain.peer_host = String::from("127.0.0.1");
30353031

30363032
let mut btcd_controller = BitcoinCoreController::new(config.clone());
30373033
btcd_controller
30383034
.start_bitcoind()
30393035
.expect("bitcoind should be started!");
30403036

3037+
let wallets = BitcoinRPCRequest::list_wallets(&config).unwrap();
3038+
assert_eq!(0, wallets.len());
3039+
30413040
let btc_controller = BitcoinRegtestController::new(config.clone(), None);
30423041
btc_controller
30433042
.create_wallet_if_dne()
30443043
.expect("Wallet should now exists!");
3044+
3045+
let wallets = BitcoinRPCRequest::list_wallets(&config).unwrap();
3046+
assert_eq!(1, wallets.len());
3047+
assert_eq!("".to_owned(), wallets[0]);
30453048
}
30463049

30473050
#[test]
@@ -3053,8 +3056,9 @@ mod tests {
30533056
let mut config = Config::default();
30543057
config.burnchain.magic_bytes = "T3".as_bytes().into();
30553058
config.burnchain.local_mining_public_key = Some(miner_pubkey.to_hex());
3056-
config.burnchain.username = Some("user".to_owned());
3057-
config.burnchain.password = Some("12345".to_owned());
3059+
config.burnchain.username = Some(String::from("user"));
3060+
config.burnchain.password = Some(String::from("12345"));
3061+
config.burnchain.peer_host = String::from("127.0.0.1");
30583062

30593063
let mut btcd_controller = BitcoinCoreController::new(config.clone());
30603064
btcd_controller
@@ -3080,8 +3084,9 @@ mod tests {
30803084
let mut config = Config::default();
30813085
config.burnchain.magic_bytes = "T3".as_bytes().into();
30823086
config.burnchain.local_mining_public_key = Some(miner_pubkey.to_hex());
3083-
config.burnchain.username = Some("user".to_owned());
3084-
config.burnchain.password = Some("12345".to_owned());
3087+
config.burnchain.username = Some(String::from("user"));
3088+
config.burnchain.password = Some(String::from("12345"));
3089+
config.burnchain.peer_host = String::from("127.0.0.1");
30853090

30863091
let mut btcd_controller = BitcoinCoreController::new(config.clone());
30873092
btcd_controller
@@ -3109,9 +3114,10 @@ mod tests {
31093114

31103115
let mut config = Config::default();
31113116
config.burnchain.magic_bytes = "T3".as_bytes().into();
3117+
config.burnchain.username = Some(String::from("user"));
3118+
config.burnchain.password = Some(String::from("12345"));
3119+
config.burnchain.peer_host = String::from("127.0.0.1");
31123120
config.burnchain.local_mining_public_key = Some(miner_pubkey.to_hex());
3113-
config.burnchain.username = Some("user".to_owned());
3114-
config.burnchain.password = Some("12345".to_owned());
31153121

31163122
let mut btcd_controller = BitcoinCoreController::new(config.clone());
31173123
btcd_controller
@@ -3177,10 +3183,11 @@ mod tests {
31773183

31783184
let mut config = Config::default();
31793185
config.burnchain.magic_bytes = "T3".as_bytes().into();
3186+
config.burnchain.username = Some(String::from("user"));
3187+
config.burnchain.password = Some(String::from("12345"));
3188+
config.burnchain.peer_host = String::from("127.0.0.1");
31803189
config.burnchain.local_mining_public_key = Some(miner_pubkey.to_hex());
3181-
config.burnchain.username = Some("user".to_owned());
3182-
config.burnchain.password = Some("12345".to_owned());
3183-
3190+
31843191
let mut btcd_controller = BitcoinCoreController::new(config.clone());
31853192
btcd_controller
31863193
.start_bitcoind()
@@ -3246,9 +3253,10 @@ mod tests {
32463253

32473254
let mut config = Config::default();
32483255
config.burnchain.magic_bytes = "T3".as_bytes().into();
3256+
config.burnchain.username = Some(String::from("user"));
3257+
config.burnchain.password = Some(String::from("12345"));
3258+
config.burnchain.peer_host = String::from("127.0.0.1");
32493259
config.burnchain.local_mining_public_key = Some(miner_pubkey.to_hex());
3250-
config.burnchain.username = Some("user".to_owned());
3251-
config.burnchain.password = Some("12345".to_owned());
32523260

32533261
let mut btcd_controller = BitcoinCoreController::new(config.clone());
32543262
btcd_controller
@@ -3323,9 +3331,10 @@ mod tests {
33233331

33243332
let mut config = Config::default();
33253333
config.burnchain.magic_bytes = "T3".as_bytes().into();
3334+
config.burnchain.username = Some(String::from("user"));
3335+
config.burnchain.password = Some(String::from("12345"));
3336+
config.burnchain.peer_host = String::from("127.0.0.1");
33263337
config.burnchain.local_mining_public_key = Some(miner_pubkey.to_hex());
3327-
config.burnchain.username = Some("user".to_owned());
3328-
config.burnchain.password = Some("12345".to_owned());
33293338

33303339
let mut btcd_controller = BitcoinCoreController::new(config.clone());
33313340
btcd_controller

0 commit comments

Comments
 (0)