Skip to content

Commit 54adcf6

Browse files
caseycasey
authored
Identify collapsible nodes with class=collapse (ordinals#4055)
1 parent c525fcd commit 54adcf6

27 files changed

+128
-161
lines changed

‎src/subcommand/server.rs

+28-28
Original file line numberDiff line numberDiff line change
@@ -3242,9 +3242,9 @@ mod tests {
32423242
<dt>turbo</dt>
32433243
<dd>true</dd>
32443244
<dt>etching</dt>
3245-
<dd><a class=monospace href=/tx/{txid}>{txid}</a></dd>
3245+
<dd><a class=collapse href=/tx/{txid}>{txid}</a></dd>
32463246
<dt>parent</dt>
3247-
<dd><a class=monospace href=/inscription/{txid}i0>{txid}i0</a></dd>
3247+
<dd><a class=collapse href=/inscription/{txid}i0>{txid}i0</a></dd>
32483248
</dl>
32493249
.*"
32503250
),
@@ -3689,7 +3689,7 @@ mod tests {
36893689
<dd>.*</dd>
36903690
<dt>git commit</dt>
36913691
<dd>
3692-
<a class=monospace href=https://github.com/ordinals/ord/commit/[[:xdigit:]]{40}>
3692+
<a class=collapse href=https://github.com/ordinals/ord/commit/[[:xdigit:]]{40}>
36933693
[[:xdigit:]]{40}
36943694
</a>
36953695
</dd>
@@ -3842,7 +3842,7 @@ mod tests {
38423842
<dl>
38433843
<dt>value</dt><dd>5000000000</dd>
38443844
<dt>script pubkey</dt><dd class=monospace>OP_PUSHBYTES_65 [[:xdigit:]]{{130}} OP_CHECKSIG</dd>
3845-
<dt>transaction</dt><dd><a class=monospace href=/tx/{txid}>{txid}</a></dd>
3845+
<dt>transaction</dt><dd><a class=collapse href=/tx/{txid}>{txid}</a></dd>
38463846
<dt>spent</dt><dd>false</dd>
38473847
</dl>
38483848
<h2>1 Sat Range</h2>
@@ -3864,7 +3864,7 @@ mod tests {
38643864
<dl>
38653865
<dt>value</dt><dd>5000000000</dd>
38663866
<dt>script pubkey</dt><dd class=monospace>OP_PUSHBYTES_65 [[:xdigit:]]{{130}} OP_CHECKSIG</dd>
3867-
<dt>transaction</dt><dd><a class=monospace href=/tx/{txid}>{txid}</a></dd>
3867+
<dt>transaction</dt><dd><a class=collapse href=/tx/{txid}>{txid}</a></dd>
38683868
<dt>spent</dt><dd>false</dd>
38693869
</dl>.*"
38703870
),
@@ -3887,7 +3887,7 @@ mod tests {
38873887
<dl>
38883888
<dt>value</dt><dd>5000000000</dd>
38893889
<dt>script pubkey</dt><dd class=monospace></dd>
3890-
<dt>transaction</dt><dd><a class=monospace href=/tx/{txid}>{txid}</a></dd>
3890+
<dt>transaction</dt><dd><a class=collapse href=/tx/{txid}>{txid}</a></dd>
38913891
<dt>spent</dt><dd>false</dd>
38923892
</dl>
38933893
<h2>1 Sat Range</h2>
@@ -3935,8 +3935,8 @@ mod tests {
39353935
format!(
39363936
".*<dl>
39373937
<dt>id</dt>
3938-
<dd class=monospace>{inscription_id}</dd>.*<dt>output</dt>
3939-
<dd><a class=monospace href=/output/0000000000000000000000000000000000000000000000000000000000000000:0>0000000000000000000000000000000000000000000000000000000000000000:0</a></dd>.*"
3938+
<dd class=collapse>{inscription_id}</dd>.*<dt>output</dt>
3939+
<dd><a class=collapse href=/output/0000000000000000000000000000000000000000000000000000000000000000:0>0000000000000000000000000000000000000000000000000000000000000000:0</a></dd>.*"
39403940
),
39413941
);
39423942

@@ -4057,7 +4057,7 @@ mod tests {
40574057
test_server.assert_response_regex(
40584058
"/blocks",
40594059
StatusCode::OK,
4060-
".*<ol start=96 reversed class=block-list>\n( <li><a class=monospace href=/block/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>\n){95}</ol>.*"
4060+
".*<ol start=96 reversed class=block-list>\n( <li><a class=collapse href=/block/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>\n){95}</ol>.*"
40614061
);
40624062
}
40634063

@@ -4155,12 +4155,12 @@ mod tests {
41554155
</dl>
41564156
<h2>1 Input</h2>
41574157
<ul>
4158-
<li><a class=monospace href=/output/0000000000000000000000000000000000000000000000000000000000000000:4294967295>0000000000000000000000000000000000000000000000000000000000000000:4294967295</a></li>
4158+
<li><a class=collapse href=/output/0000000000000000000000000000000000000000000000000000000000000000:4294967295>0000000000000000000000000000000000000000000000000000000000000000:4294967295</a></li>
41594159
</ul>
41604160
<h2>1 Output</h2>
41614161
<ul class=monospace>
41624162
<li>
4163-
<a href=/output/{txid}:0 class=monospace>
4163+
<a href=/output/{txid}:0 class=collapse>
41644164
{txid}:0
41654165
</a>
41664166
<dl>
@@ -5492,7 +5492,7 @@ next
54925492
format!(
54935493
".*<title>Inscription 1</title>.*
54945494
.*<dt>id</dt>
5495-
.*<dd class=monospace>{child0}</dd>.*"
5495+
.*<dd class=collapse>{child0}</dd>.*"
54965496
),
54975497
);
54985498

@@ -5507,7 +5507,7 @@ next
55075507
format!(
55085508
".*<title>Inscription -1</title>.*
55095509
.*<dt>id</dt>
5510-
.*<dd class=monospace>{child1}</dd>.*"
5510+
.*<dd class=collapse>{child1}</dd>.*"
55115511
),
55125512
);
55135513
}
@@ -5668,7 +5668,7 @@ next
56685668
".*<h1>Inscription 0</h1>.*
56695669
<dl>
56705670
<dt>id</dt>
5671-
<dd class=monospace>{inscription_id}</dd>.*"
5671+
<dd class=collapse>{inscription_id}</dd>.*"
56725672
),
56735673
);
56745674
server.assert_response_regex(
@@ -5678,7 +5678,7 @@ next
56785678
".*<h1>Inscription 0</h1>.*
56795679
<dl>
56805680
<dt>id</dt>
5681-
<dd class=monospace>{inscription_id}</dd>.*"
5681+
<dd class=collapse>{inscription_id}</dd>.*"
56825682
),
56835683
);
56845684

@@ -5689,7 +5689,7 @@ next
56895689
".*<h1>Inscription -1</h1>.*
56905690
<dl>
56915691
<dt>id</dt>
5692-
<dd class=monospace>{cursed_inscription_id}</dd>.*"
5692+
<dd class=collapse>{cursed_inscription_id}</dd>.*"
56935693
),
56945694
)
56955695
}
@@ -5720,7 +5720,7 @@ next
57205720
".*<h1>Inscription -1</h1>.*
57215721
<dl>
57225722
<dt>id</dt>
5723-
<dd class=monospace>{id}</dd>
5723+
<dd class=collapse>{id}</dd>
57245724
<dt>charms</dt>
57255725
<dd>
57265726
<span title=cursed>👹</span>
@@ -5759,7 +5759,7 @@ next
57595759
".*<h1>Inscription 0</h1>.*
57605760
<dl>
57615761
<dt>id</dt>
5762-
<dd class=monospace>{id}</dd>
5762+
<dd class=collapse>{id}</dd>
57635763
.*
57645764
<dt>value</dt>
57655765
.*
@@ -5795,7 +5795,7 @@ next
57955795
".*<h1>Inscription 0</h1>.*
57965796
<dl>
57975797
<dt>id</dt>
5798-
<dd class=monospace>{id}</dd>
5798+
<dd class=collapse>{id}</dd>
57995799
<dt>charms</dt>
58005800
<dd>.*<span title=coin>🪙</span>.*</dd>
58015801
.*
@@ -5831,7 +5831,7 @@ next
58315831
".*<h1>Inscription 0</h1>.*
58325832
<dl>
58335833
<dt>id</dt>
5834-
<dd class=monospace>{id}</dd>
5834+
<dd class=collapse>{id}</dd>
58355835
<dt>charms</dt>
58365836
<dd>.*<span title=uncommon>🌱</span>.*</dd>
58375837
.*
@@ -5867,7 +5867,7 @@ next
58675867
".*<h1>Inscription 0</h1>.*
58685868
<dl>
58695869
<dt>id</dt>
5870-
<dd class=monospace>{id}</dd>
5870+
<dd class=collapse>{id}</dd>
58715871
<dt>charms</dt>
58725872
<dd>.*<span title=nineball>9️⃣</span>.*</dd>
58735873
.*
@@ -5907,7 +5907,7 @@ next
59075907
".*<h1>Inscription -1</h1>.*
59085908
<dl>
59095909
<dt>id</dt>
5910-
<dd class=monospace>{id}</dd>
5910+
<dd class=collapse>{id}</dd>
59115911
<dt>charms</dt>
59125912
<dd>
59135913
<span title=reinscription>♻️</span>
@@ -5971,7 +5971,7 @@ next
59715971
".*<h1>Inscription 0</h1>.*
59725972
<dl>
59735973
<dt>id</dt>
5974-
<dd class=monospace>{id}</dd>
5974+
<dd class=collapse>{id}</dd>
59755975
.*
59765976
<dt>value</dt>
59775977
.*
@@ -6032,7 +6032,7 @@ next
60326032
".*<h1>Inscription 0</h1>.*
60336033
<dl>
60346034
<dt>id</dt>
6035-
<dd class=monospace>{id}</dd>
6035+
<dd class=collapse>{id}</dd>
60366036
.*
60376037
<dt>value</dt>
60386038
.*
@@ -6082,7 +6082,7 @@ next
60826082
".*<h1>Inscription -1</h1>.*
60836083
<dl>
60846084
<dt>id</dt>
6085-
<dd class=monospace>{id}</dd>
6085+
<dd class=collapse>{id}</dd>
60866086
<dt>charms</dt>
60876087
<dd>
60886088
<span title=cursed>👹</span>
@@ -6118,7 +6118,7 @@ next
61186118
".*<h1>Inscription 0</h1>.*
61196119
<dl>
61206120
<dt>id</dt>
6121-
<dd class=monospace>{id}</dd>
6121+
<dd class=collapse>{id}</dd>
61226122
.*
61236123
<dt>value</dt>
61246124
<dd>5000000000</dd>
@@ -6144,7 +6144,7 @@ next
61446144
".*<h1>Inscription 0</h1>.*
61456145
<dl>
61466146
<dt>id</dt>
6147-
<dd class=monospace>{id}</dd>
6147+
<dd class=collapse>{id}</dd>
61486148
<dt>charms</dt>
61496149
<dd>
61506150
<span title=lost>🤔</span>
@@ -6603,7 +6603,7 @@ next
66036603
".*<h1>Inscription 1</h1>.*
66046604
<dl>
66056605
<dt>id</dt>
6606-
<dd class=monospace>{id}</dd>
6606+
<dd class=collapse>{id}</dd>
66076607
.*
66086608
<dt>delegate</dt>
66096609
<dd><a href=/inscription/{delegate}>{delegate}</a></dd>

‎src/templates/address.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ mod tests {
8787
#[test]
8888
fn test_outputs_rendering() {
8989
let address_html = setup();
90-
let expected_pattern = r#".*<dt>outputs</dt>\n\s*<dd>\n\s*<ul>\n\s*<li><a class=monospace href=/output/1{64}:1>1{64}:1</a></li>\n\s*<li><a class=monospace href=/output/2{64}:2>2{64}:2</a></li>\n\s*</ul>\n\s*</dd>.*"#;
90+
let expected_pattern = r#".*<dt>outputs</dt>\n\s*<dd>\n\s*<ul>\n\s*<li><a class=collapse href=/output/1{64}:1>1{64}:1</a></li>\n\s*<li><a class=collapse href=/output/2{64}:2>2{64}:2</a></li>\n\s*</ul>\n\s*</dd>.*"#;
9191
assert_regex_match!(address_html, expected_pattern);
9292
}
9393
}

‎src/templates/block.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ mod tests {
5858
"
5959
<h1>Block 0</h1>
6060
<dl>
61-
<dt>hash</dt><dd class=monospace>[[:xdigit:]]{64}</dd>
62-
<dt>target</dt><dd class=monospace>[[:xdigit:]]{64}</dd>
61+
<dt>hash</dt><dd class=collapse>[[:xdigit:]]{64}</dd>
62+
<dt>target</dt><dd class=collapse>[[:xdigit:]]{64}</dd>
6363
<dt>timestamp</dt><dd><time>2009-01-03 18:15:05 UTC</time></dd>
6464
<dt>size</dt><dd>285</dd>
6565
<dt>weight</dt><dd>1140</dd>
@@ -74,7 +74,7 @@ mod tests {
7474
</div>
7575
<h2>1 Transaction</h2>
7676
<ul>
77-
<li><a class=monospace href=/tx/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>
77+
<li><a class=collapse href=/tx/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>
7878
</ul>
7979
"
8080
.unindent()

‎src/templates/blocks.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ mod tests {
7979
</div>
8080
</div>
8181
<ol start=1260001 reversed class=block-list>
82-
<li><a class=monospace href=/block/1{64}>1{64}</a></li>
83-
<li><a class=monospace href=/block/0{64}>0{64}</a></li>
82+
<li><a class=collapse href=/block/1{64}>1{64}</a></li>
83+
<li><a class=collapse href=/block/0{64}>0{64}</a></li>
8484
</ol>
8585
"
8686
.unindent(),

‎src/templates/input.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ mod tests {
3939
"
4040
<h1>Input /1/2/3</h1>
4141
<dl>
42-
<dt>previous output</dt><dd class=monospace>0000000000000000000000000000000000000000000000000000000000000000:0</dd>
42+
<dt>previous output</dt><dd class=collapse>0000000000000000000000000000000000000000000000000000000000000000:0</dd>
4343
<dt>witness</dt><dd class=monospace>010101</dd>
4444
<dt>script sig</dt><dd class=monospace>OP_PUSHBYTES_3 666f6f</dd>
4545
<dt>text</dt><dd>\x03foo</dd>

0 commit comments

Comments
 (0)