Skip to content

Commit 0235b18

Browse files
authored
Allow empty query parameters on /satscard route (#4238)
1 parent 7d30613 commit 0235b18

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
lines changed

crates/ordinals/src/rune.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl Rune {
119119
pub fn reserved(block: u64, tx: u32) -> Self {
120120
Self(
121121
Self::RESERVED
122-
.checked_add(u128::from(block) << 32 | u128::from(tx))
122+
.checked_add((u128::from(block) << 32) | u128::from(tx))
123123
.unwrap(),
124124
)
125125
}
@@ -416,7 +416,7 @@ mod tests {
416416
assert_eq!(Rune::reserved(1, 1), Rune(Rune::RESERVED + (1 << 32) + 1));
417417
assert_eq!(
418418
Rune::reserved(u64::MAX, u32::MAX),
419-
Rune(Rune::RESERVED + (u128::from(u64::MAX) << 32 | u128::from(u32::MAX))),
419+
Rune(Rune::RESERVED + ((u128::from(u64::MAX) << 32) | u128::from(u32::MAX))),
420420
);
421421
}
422422

crates/ordinals/src/spaced_rune.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl Display for SpacedRune {
5353
for (i, c) in rune.chars().enumerate() {
5454
write!(f, "{c}")?;
5555

56-
if i < rune.len() - 1 && self.spacers & 1 << i != 0 {
56+
if i < rune.len() - 1 && self.spacers & (1 << i) != 0 {
5757
write!(f, "•")?;
5858
}
5959
}

crates/ordinals/src/varint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ mod tests {
9595
let mut n = 0;
9696

9797
for i in 0..129 {
98-
n = n << 1 | (i % 2);
98+
n = (n << 1) | (i % 2);
9999
let encoded = encode(n);
100100
let (decoded, length) = decode(&encoded).unwrap();
101101
assert_eq!(decoded, n);

src/index/entry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ impl Entry for SatRange {
469469
fn store(self) -> Self::Value {
470470
let base = self.0;
471471
let delta = self.1 - self.0;
472-
let n = u128::from(base) | u128::from(delta) << 51;
472+
let n = u128::from(base) | (u128::from(delta) << 51);
473473
n.to_le_bytes()[0..11].try_into().unwrap()
474474
}
475475
}

src/index/updater/inscription_updater.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ impl InscriptionUpdater<'_, '_> {
252252
// still have to normalize over inscription size
253253
for flotsam in &mut floating_inscriptions {
254254
if let Flotsam {
255-
origin: Origin::New { ref mut fee, .. },
255+
origin: Origin::New { fee, .. },
256256
..
257257
} = flotsam
258258
{

src/subcommand/server.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ impl Server {
619619
};
620620
}
621621

622-
let satscard = if let Some(query) = uri.query() {
622+
let satscard = if let Some(query) = uri.query().filter(|query| !query.is_empty()) {
623623
let satscard = Satscard::from_query_parameters(settings.chain(), query).map_err(|err| {
624624
ServerError::BadRequest(format!("invalid satscard query parameters: {err}"))
625625
})?;
@@ -7448,6 +7448,14 @@ next
74487448
);
74497449
}
74507450

7451+
#[test]
7452+
fn satscard_empty_query_parameters_are_allowed() {
7453+
TestServer::builder()
7454+
.chain(Chain::Mainnet)
7455+
.build()
7456+
.assert_html("/satscard?", SatscardHtml { satscard: None });
7457+
}
7458+
74517459
#[test]
74527460
fn satscard_display_without_address_index() {
74537461
TestServer::builder()

0 commit comments

Comments
 (0)