kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-01 08:42:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: use config.burnchain.wallet_name instead of "" when we're actually dealing with wallet names

Browse Source
This commit is contained in:
Jude Nelson
2023-03-01 13:12:26 -05:00
parent 0b8159d5b4
commit 89e0bcaf5e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs
View File

@@ -667,13 +667,13 @@ impl BitcoinRegtestController {
result_vec
}
/// Checks if there is a default wallet with the name of "".
/// If the default wallet does not exist, this function creates a wallet with name "".
/// Checks if the config-supplied wallet exists.
/// If it does not exist, this function creates it.
pub fn create_wallet_if_dne(&self) -> RPCResult<()> {
let wallets = BitcoinRPCRequest::list_wallets(&self.config)?;
if !wallets.contains(&("".to_string())) {
BitcoinRPCRequest::create_wallet(&self.config, "")?;
if !wallets.contains(&self.config.burnchain.wallet_name) {
BitcoinRPCRequest::create_wallet(&self.config, &self.config.burnchain.wallet_name)?;
}
Ok(())
}
@@ -2138,15 +2138,15 @@ impl BitcoinRPCRequest {
let url = {
// some methods require a wallet ID
let wallet_id = match payload.method.as_str() {
"importaddress" | "listunspent" => Some("".to_string()),
"importaddress" | "listunspent" => Some(config.burnchain.wallet_name.clone()),
_ => None,
};
let url = config.burnchain.get_rpc_url(wallet_id);
Url::parse(&url).expect(&format!("Unable to parse {} as a URL", url))
};
debug!(
"BitcoinRPC builder: {:?}:{:?}@{}",
&config.burnchain.username, &config.burnchain.password, &url
"BitcoinRPC builder '{}': {:?}:{:?}@{}",
&payload.method, &config.burnchain.username, &config.burnchain.password, &url
);
let mut req = Request::new(Method::Post, url);