Skip to content

Commit

Permalink
change default ZMQ port, bump version for release
Browse files Browse the repository at this point in the history
  • Loading branch information
Ash-L2L committed Jul 1, 2024
1 parent 4014b0d commit 59add54
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ members = [
[workspace.package]
authors = [ "Ash Manning <[email protected]>" ]
edition = "2021"
version = "0.9.0"
version = "0.9.1"

[workspace.dependencies.bip300301]
git = "https://github.com/Ash-L2L/bip300301.git"
Expand Down
3 changes: 2 additions & 1 deletion app/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ const DEFAULT_RPC_ADDR: SocketAddr =
ipv4_socket_addr([127, 0, 0, 1], 6000 + THIS_SIDECHAIN as u16);

#[cfg(all(not(target_os = "windows"), feature = "zmq"))]
const DEFAULT_ZMQ_ADDR: SocketAddr = ipv4_socket_addr([127, 0, 0, 1], 28332);
const DEFAULT_ZMQ_ADDR: SocketAddr =
ipv4_socket_addr([127, 0, 0, 1], 28000 + THIS_SIDECHAIN as u16);

/// Implement arg manually so that there is only a default if we can resolve
/// the default data dir
Expand Down
7 changes: 6 additions & 1 deletion app/rpc_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,20 @@ fn custom_err(err_msg: impl Into<String>) -> ErrorObject<'static> {
}

fn convert_app_err(err: app::Error) -> ErrorObject<'static> {
tracing::error!("{err}");
let err = anyhow::anyhow!(err);
tracing::error!("{err:#}");
custom_err(err.to_string())
}

fn convert_node_err(err: node::Error) -> ErrorObject<'static> {
let err = anyhow::anyhow!(err);
tracing::error!("{err:#}");
custom_err(err.to_string())
}

fn convert_wallet_err(err: wallet::Error) -> ErrorObject<'static> {
let err = anyhow::anyhow!(err);
tracing::error!("{err:#}");
custom_err(err.to_string())
}

Expand Down

0 comments on commit 59add54

Please sign in to comment.