Skip to content
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

Fix remote RPC wallet commands #1766

Merged
merged 8 commits into from
Jul 28, 2023
Merged

Fix remote RPC wallet commands #1766

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9082eb
Fix remote RPC wallet commands
carlosalaniz Feb 16, 2023
a0d9ceb
Merge branch 'master' into FIX_remote_RPC_wallet_commands
carlosalaniz Mar 23, 2023
0497c52
Merge branch 'master' into FIX_remote_RPC_wallet_commands
raphjaph Jul 28, 2023
24a8e60
Merge branch 'master' of github.com:ordinals/ord into FIX_remote_RPC_…
raphjaph Jul 28, 2023
f160223
Merge branch 'FIX_remote_RPC_wallet_commands' of github.com:carlosala…
raphjaph Jul 28, 2023
93a18dd
fmt
raphjaph Jul 28, 2023
f90a9b1
small idiomatic adjustment
raphjaph Jul 28, 2023
639e7eb
small idiomatic adjustment and test
raphjaph Jul 28, 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
8 changes: 5 additions & 3 deletions src/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,15 @@ impl Options {
}

pub(crate) fn rpc_url(&self) -> String {
self.rpc_url.clone().unwrap_or_else(|| {
if let Some(rpc_url) = &self.rpc_url {
format!("{rpc_url}/wallet/{}", self.wallet)
} else {
format!(
"127.0.0.1:{}/wallet/{}",
self.chain().default_rpc_port(),
self.wallet
)
})
}
}

pub(crate) fn cookie_file(&self) -> Result<PathBuf> {
Expand Down Expand Up @@ -285,7 +287,7 @@ mod tests {
.unwrap()
.options
.rpc_url(),
"127.0.0.1:1234"
"127.0.0.1:1234/wallet/ord"
);
}

Expand Down