Skip to content

Commit

Permalink
Merge pull request fedimint#5990 from tvolk131/update_nix_flake
Browse files Browse the repository at this point in the history
chore: update nix flake
  • Loading branch information
tvolk131 authored Sep 9, 2024
2 parents 42c0688 + 36d20e9 commit 9d817da
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 19 deletions.
6 changes: 2 additions & 4 deletions fedimint-core/src/envs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,16 @@ impl BitcoinRpcConfig {
pub fn get_defaults_from_env_vars() -> anyhow::Result<Self> {
Ok(Self {
kind: env::var(FM_DEFAULT_BITCOIN_RPC_KIND_ENV)
.or_else(|_| env::var(FM_BITCOIN_RPC_KIND_ENV).map(|v| {
.or_else(|_| env::var(FM_BITCOIN_RPC_KIND_ENV).inspect(|_v| {
warn!(target: LOG_CORE, "{FM_BITCOIN_RPC_KIND_ENV} is obsolete, use {FM_DEFAULT_BITCOIN_RPC_KIND_ENV} instead");
v
})
)
.with_context(|| {
anyhow::anyhow!("failure looking up env var {FM_DEFAULT_BITCOIN_RPC_KIND_ENV}")
})?,
url: env::var(FM_DEFAULT_BITCOIN_RPC_URL_ENV)
.or_else(|_| env::var(FM_BITCOIN_RPC_URL_ENV).map(|v| {
.or_else(|_| env::var(FM_BITCOIN_RPC_URL_ENV).inspect(|_v| {
warn!(target: LOG_CORE, "{FM_BITCOIN_RPC_URL_ENV} is obsolete, use {FM_DEFAULT_BITCOIN_RPC_URL_ENV} instead");
v
})
)
.with_context(|| {
Expand Down
3 changes: 1 addition & 2 deletions fedimint-server/src/net/framed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,11 @@ where
assert_eq!(dst.len(), old_len + 8);

// Then we serialize the message into the buffer
bincode::serialize_into(dst.writer(), &item).map_err(|e| {
bincode::serialize_into(dst.writer(), &item).inspect_err(|_e| {
error!(
target: LOG_NET_PEER,
"Serializing message failed: {:?}", item
);
e
})?;

// Lastly we update the length field by counting how many bytes have been
Expand Down
2 changes: 1 addition & 1 deletion fedimint-wasm-tests/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ mod tests {
use futures::StreamExt;
use wasm_bindgen_test::wasm_bindgen_test;

use super::*;
use super::{client, faucet, Result};

#[wasm_bindgen_test]
async fn build_client() -> Result<()> {
Expand Down
24 changes: 12 additions & 12 deletions flake.lock

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

0 comments on commit 9d817da

Please sign in to comment.