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

Jump to bottom

Add sequence number #2460

Merged
merged 11 commits into from
Sep 25, 2023
Merged

Add sequence number #2460

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f84e803
Add sequence number
raphjaph Sep 20, 2023
fb19723
rename number to inscription_number
raphjaph Sep 20, 2023
8eef2df
quick fix
raphjaph Sep 20, 2023
574fa44
quick fix
raphjaph Sep 20, 2023
d4896b9
Fixy fixy!
casey Sep 20, 2023
9d8c829
Remove dbg!
casey Sep 20, 2023
e5f0d83
placate clippy
raphjaph Sep 20, 2023
172b498
tweak some tests and function
raphjaph Sep 21, 2023
19c396b
get rid of reinscription id to sequence number table
raphjaph Sep 21, 2023
58aa9b4
remove sequence number from front-end
raphjaph Sep 21, 2023
9e7b3e4
address nits
raphjaph Sep 21, 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
Prev Previous commit
Next Next commit
remove sequence number from front-end
  • Loading branch information
@raphjaph
raphjaph committed Sep 21, 2023
commit 58aa9b42910d3bdb8d13783180e9f74f44615af1
4 changes: 0 additions & 4 deletions src/subcommand/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,6 @@ impl Server {
entry.parent,
next,
entry.inscription_number,
entry.sequence_number,
output,
previous,
entry.sat,
Expand All @@ -1033,7 +1032,6 @@ impl Server {
inscription_id,
next,
inscription_number: entry.inscription_number,
sequence_number: entry.sequence_number,
output,
parent: entry.parent,
previous,
Expand Down Expand Up @@ -1957,8 +1955,6 @@ mod tests {
".*<dl>
<dt>id</dt>
<dd class=monospace>{inscription_id}</dd>
<dt>sequence number</dt>
<dd>0</dd>
<dt>preview</dt>.*<dt>output</dt>
<dd><a class=monospace href=/output/0000000000000000000000000000000000000000000000000000000000000000:0>0000000000000000000000000000000000000000000000000000000000000000:0 \\(unbound\\)</a></dd>.*"
),
Expand Down
20 changes: 0 additions & 20 deletions src/templates/inscription.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ pub(crate) struct InscriptionHtml {
pub(crate) inscription_id: InscriptionId,
pub(crate) next: Option<InscriptionId>,
pub(crate) inscription_number: i64,
pub(crate) sequence_number: u64,
pub(crate) output: Option<TxOut>,
pub(crate) parent: Option<InscriptionId>,
pub(crate) previous: Option<InscriptionId>,
Expand All @@ -30,7 +29,6 @@ pub struct InscriptionJson {
pub inscription_id: InscriptionId,
pub next: Option<InscriptionId>,
pub inscription_number: i64,
pub sequence_number: u64,
pub output_value: Option<u64>,
pub parent: Option<InscriptionId>,
pub previous: Option<InscriptionId>,
Expand All @@ -50,7 +48,6 @@ impl InscriptionJson {
parent: Option<InscriptionId>,
next: Option<InscriptionId>,
inscription_number: i64,
sequence_number: u64,
output: Option<TxOut>,
previous: Option<InscriptionId>,
sat: Option<Sat>,
Expand All @@ -61,7 +58,6 @@ impl InscriptionJson {
inscription_id,
children,
inscription_number,
sequence_number,
genesis_height,
parent,
genesis_fee,
Expand Down Expand Up @@ -108,7 +104,6 @@ mod tests {
inscription_id: inscription_id(1),
next: None,
inscription_number: 1,
sequence_number: 1,
output: None,
previous: None,
sat: None,
Expand All @@ -125,8 +120,6 @@ mod tests {
<dl>
<dt>id</dt>
<dd class=monospace>1{64}i1</dd>
<dt>sequence number</dt>
<dd>1</dd>
<dt>preview</dt>
<dd><a href=/preview/1{64}i1>link</a></dd>
<dt>content</dt>
Expand Down Expand Up @@ -168,7 +161,6 @@ mod tests {
inscription_id: inscription_id(1),
next: None,
inscription_number: 1,
sequence_number: 1,
output: Some(tx_out(1, address())),
previous: None,
sat: None,
Expand Down Expand Up @@ -208,7 +200,6 @@ mod tests {
inscription_id: inscription_id(1),
next: None,
inscription_number: 1,
sequence_number: 1,
output: Some(tx_out(1, address())),
previous: None,
sat: Some(Sat(1)),
Expand Down Expand Up @@ -243,7 +234,6 @@ mod tests {
inscription_id: inscription_id(2),
next: Some(inscription_id(3)),
inscription_number: 1,
sequence_number: 1,
output: Some(tx_out(1, address())),
previous: Some(inscription_id(1)),
sat: None,
Expand Down Expand Up @@ -276,7 +266,6 @@ mod tests {
inscription_id: inscription_id(2),
next: None,
inscription_number: -1,
sequence_number: 2,
output: Some(tx_out(1, address())),
previous: None,
sat: None,
Expand All @@ -290,9 +279,6 @@ mod tests {
<h1>Inscription -1 \\(unstable\\)</h1>
.*
<dl>
.*
<dt>sequence number</dt>
<dd>2</dd>
.*
<dt>location</dt>
<dd class=monospace>0{64}:0:0 \\(unbound\\)</dd>
Expand All @@ -318,7 +304,6 @@ mod tests {
inscription_id: inscription_id(1),
next: None,
inscription_number: 1,
sequence_number: 1,
output: None,
previous: None,
sat: None,
Expand All @@ -337,8 +322,6 @@ mod tests {
<dd class=monospace>1{64}i1</dd>
<dt>parent</dt>
<dd><a class=monospace href=/inscription/2{64}i2>2{64}i2</a></dd>
<dt>sequence number</dt>
<dd>1</dd>
<dt>preview</dt>
<dd><a href=/preview/1{64}i1>link</a></dd>
<dt>content</dt>
Expand Down Expand Up @@ -380,7 +363,6 @@ mod tests {
inscription_id: inscription_id(1),
next: None,
inscription_number: 1,
sequence_number: 1,
output: None,
previous: None,
sat: None,
Expand All @@ -397,8 +379,6 @@ mod tests {
<dl>
<dt>id</dt>
<dd class=monospace>1{64}i1</dd>
<dt>sequence number</dt>
<dd>1</dd>
<dt>preview</dt>
<dd><a href=/preview/1{64}i1>link</a></dd>
<dt>content</dt>
Expand Down
2 changes: 0 additions & 2 deletions templates/inscription.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ <h1>Inscription {{ self.inscription_number }} (unstable)</h1>
<dt>parent</dt>
<dd><a class=monospace href=/inscription/{{ parent }}>{{ parent }}</a></dd>
%% }
<dt>sequence number</dt>
<dd>{{ self.sequence_number }}</dd>
%% if let Some(output) = &self.output {
%% if let Ok(address) = self.chain.address_from_script(&output.script_pubkey ) {
<dt>address</dt>
Expand Down
2 changes: 0 additions & 2 deletions tests/json_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ fn get_inscription() {
children: Vec::new(),
inscription_id,
inscription_number: 0,
sequence_number: 0,
genesis_height: 2,
genesis_fee: 138,
output_value: Some(10000),
Expand Down Expand Up @@ -278,7 +277,6 @@ fn get_inscriptions() {
inscription_json.inscription_id,
inscriptions_json.inscriptions[0]
);
assert_eq!(inscription_json.sequence_number, i);
}
}

Expand Down
2 changes: 0 additions & 2 deletions tests/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ fn inscription_page() {
<dl>
<dt>id</dt>
<dd class=monospace>{inscription}</dd>
<dt>sequence number</dt>
<dd>0</dd>
<dt>address</dt>
<dd class=monospace>bc1.*</dd>
<dt>output value</dt>
Expand Down
Loading