Skip to content

Commit 20c773c

Browse files
authored
Fix sat off-by-one error in output template (ordinals#4075)
1 parent e2b0732 commit 20c773c

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/subcommand/server.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3936,7 +3936,7 @@ mod tests {
39363936
</dl>
39373937
<h2>1 Sat Range</h2>
39383938
<ul class=monospace>
3939-
<li><a href=/sat/0 class=mythic>0</a>-<a href=/sat/5000000000 class=uncommon>5000000000</a> \\(5000000000 sats\\)</li>
3939+
<li><a href=/sat/0 class=mythic>0</a>-<a href=/sat/4999999999 class=common>4999999999</a> \\(5000000000 sats\\)</li>
39403940
</ul>.*"
39413941
),
39423942
);
@@ -3981,7 +3981,7 @@ mod tests {
39813981
</dl>
39823982
<h2>1 Sat Range</h2>
39833983
<ul class=monospace>
3984-
<li><a href=/sat/5000000000 class=uncommon>5000000000</a>-<a href=/sat/10000000000 class=uncommon>10000000000</a> \\(5000000000 sats\\)</li>
3984+
<li><a href=/sat/5000000000 class=uncommon>5000000000</a>-<a href=/sat/9999999999 class=common>9999999999</a> \\(5000000000 sats\\)</li>
39853985
</ul>.*"
39863986
),
39873987
);

src/templates/output.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ mod tests {
4848
<h2>2 Sat Ranges</h2>
4949
<ul class=monospace>
5050
<li><a href=/sat/0 class=mythic>0</a></li>
51-
<li><a href=/sat/1 class=common>1</a>-<a href=/sat/3 class=common>3</a> \\(2 sats\\)</li>
51+
<li><a href=/sat/1 class=common>1</a>-<a href=/sat/2 class=common>2</a> \\(2 sats\\)</li>
5252
</ul>
5353
"
5454
.unindent()
@@ -107,7 +107,7 @@ mod tests {
107107
<h2>2 Sat Ranges</h2>
108108
<ul class=monospace>
109109
<li><a href=/sat/0 class=mythic>0</a></li>
110-
<li><a href=/sat/1 class=common>1</a>-<a href=/sat/3 class=common>3</a> \\(2 sats\\)</li>
110+
<li><a href=/sat/1 class=common>1</a>-<a href=/sat/2 class=common>2</a> \\(2 sats\\)</li>
111111
</ul>
112112
"
113113
.unindent()

templates/output.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ <h2>{{"Sat Range".tally(sat_ranges.len())}}</h2>
3838
<ul class=monospace>
3939
%% for (start, end) in sat_ranges {
4040
%% let value = end - start;
41+
%% let last = end - 1;
4142
%% if value == 1 {
4243
<li><a href=/sat/{{start}} class={{Sat(*start).rarity()}}>{{start}}</a></li>
4344
%% } else {
44-
<li><a href=/sat/{{start}} class={{Sat(*start).rarity()}}>{{start}}</a>-<a href=/sat/{{end}} class={{Sat(*end).rarity()}}>{{end}}</a> ({{value}} sats)</li>
45+
<li><a href=/sat/{{start}} class={{Sat(*start).rarity()}}>{{start}}</a>-<a href=/sat/{{last}} class=common>{{last}}</a> ({{value}} sats)</li>
4546
%% }
4647
%% }
4748
</ul>

0 commit comments

Comments
 (0)