diff --git a/crates/ordinals/src/rune.rs b/crates/ordinals/src/rune.rs index ab052c045a..9ad0fe31b5 100644 --- a/crates/ordinals/src/rune.rs +++ b/crates/ordinals/src/rune.rs @@ -119,7 +119,7 @@ impl Rune { pub fn reserved(block: u64, tx: u32) -> Self { Self( Self::RESERVED - .checked_add(u128::from(block) << 32 | u128::from(tx)) + .checked_add((u128::from(block) << 32) | u128::from(tx)) .unwrap(), ) } @@ -416,7 +416,7 @@ mod tests { assert_eq!(Rune::reserved(1, 1), Rune(Rune::RESERVED + (1 << 32) + 1)); assert_eq!( Rune::reserved(u64::MAX, u32::MAX), - Rune(Rune::RESERVED + (u128::from(u64::MAX) << 32 | u128::from(u32::MAX))), + Rune(Rune::RESERVED + ((u128::from(u64::MAX) << 32) | u128::from(u32::MAX))), ); } diff --git a/crates/ordinals/src/spaced_rune.rs b/crates/ordinals/src/spaced_rune.rs index 72c19125c8..9fd961eb59 100644 --- a/crates/ordinals/src/spaced_rune.rs +++ b/crates/ordinals/src/spaced_rune.rs @@ -53,7 +53,7 @@ impl Display for SpacedRune { for (i, c) in rune.chars().enumerate() { write!(f, "{c}")?; - if i < rune.len() - 1 && self.spacers & 1 << i != 0 { + if i < rune.len() - 1 && self.spacers & (1 << i) != 0 { write!(f, "•")?; } } diff --git a/crates/ordinals/src/varint.rs b/crates/ordinals/src/varint.rs index f6a226946a..bddc45df84 100644 --- a/crates/ordinals/src/varint.rs +++ b/crates/ordinals/src/varint.rs @@ -95,7 +95,7 @@ mod tests { let mut n = 0; for i in 0..129 { - n = n << 1 | (i % 2); + n = (n << 1) | (i % 2); let encoded = encode(n); let (decoded, length) = decode(&encoded).unwrap(); assert_eq!(decoded, n); diff --git a/src/index/entry.rs b/src/index/entry.rs index 464cae34ff..59b16a6cfb 100644 --- a/src/index/entry.rs +++ b/src/index/entry.rs @@ -469,7 +469,7 @@ impl Entry for SatRange { fn store(self) -> Self::Value { let base = self.0; let delta = self.1 - self.0; - let n = u128::from(base) | u128::from(delta) << 51; + let n = u128::from(base) | (u128::from(delta) << 51); n.to_le_bytes()[0..11].try_into().unwrap() } } diff --git a/src/index/updater/inscription_updater.rs b/src/index/updater/inscription_updater.rs index 696990083b..ce669ca0fb 100644 --- a/src/index/updater/inscription_updater.rs +++ b/src/index/updater/inscription_updater.rs @@ -252,7 +252,7 @@ impl InscriptionUpdater<'_, '_> { // still have to normalize over inscription size for flotsam in &mut floating_inscriptions { if let Flotsam { - origin: Origin::New { ref mut fee, .. }, + origin: Origin::New { fee, .. }, .. } = flotsam { diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs index 35c97c9fb6..1ccc556bcb 100644 --- a/src/subcommand/server.rs +++ b/src/subcommand/server.rs @@ -619,7 +619,7 @@ impl Server { }; } - let satscard = if let Some(query) = uri.query() { + let satscard = if let Some(query) = uri.query().filter(|query| !query.is_empty()) { let satscard = Satscard::from_query_parameters(settings.chain(), query).map_err(|err| { ServerError::BadRequest(format!("invalid satscard query parameters: {err}")) })?; @@ -7448,6 +7448,14 @@ next ); } + #[test] + fn satscard_empty_query_parameters_are_allowed() { + TestServer::builder() + .chain(Chain::Mainnet) + .build() + .assert_html("/satscard?", SatscardHtml { satscard: None }); + } + #[test] fn satscard_display_without_address_index() { TestServer::builder()