From 274b7dedeb8a6135b8aae3a2f110127b7b744052 Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Mon, 2 Jan 2023 10:14:04 -0800
Subject: [PATCH] Avoid push_scriptint (#1136)

---
 src/index.rs                      |  2 +-
 src/subcommand/server.rs          |  8 ++++----
 src/templates/input.rs            |  6 +++---
 src/templates/output.rs           |  2 +-
 src/templates/transaction.rs      | 16 ++++++++--------
 test-bitcoincore-rpc/src/state.rs |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/index.rs b/src/index.rs
index d04d6a1c8c..db1bfe6005 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -1053,7 +1053,7 @@ mod tests {
     assert_eq!(
       context.index.find(50 * COIN_VALUE).unwrap().unwrap(),
       SatPoint {
-        outpoint: "0c4eb1fa83a7d6ce0e21e5e616a96e83a7b1658170fb544acf6f5c6a2d4b3f90:0"
+        outpoint: "30f2f037629c6a21c1f40ed39b9bd6278df39762d68d07f49582b23bcb23386a:0"
           .parse()
           .unwrap(),
         offset: 0,
diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
index 5a191a290e..6eb7dd72a5 100644
--- a/src/subcommand/server.rs
+++ b/src/subcommand/server.rs
@@ -1399,8 +1399,8 @@ mod tests {
   <dt>hash</dt><dd class=monospace>[[:xdigit:]]{64}</dd>
   <dt>target</dt><dd class=monospace>[[:xdigit:]]{64}</dd>
   <dt>timestamp</dt><dd>0</dd>
-  <dt>size</dt><dd>203</dd>
-  <dt>weight</dt><dd>812</dd>
+  <dt>size</dt><dd>202</dd>
+  <dt>weight</dt><dd>808</dd>
   <dt>previous blockhash</dt><dd><a href=/block/659f9b67fbc0b5cba0ef6ebc0aea322e1c246e29e43210bd581f5f3bd36d17bf class=monospace>659f9b67fbc0b5cba0ef6ebc0aea322e1c246e29e43210bd581f5f3bd36d17bf</a></dd>
 </dl>
 <a href=/block/1>prev</a>
@@ -1448,8 +1448,8 @@ next.*",
 <h2>1 Output</h2>
 <ul class=monospace>
   <li>
-    <a href=/output/0c4eb1fa83a7d6ce0e21e5e616a96e83a7b1658170fb544acf6f5c6a2d4b3f90:0 class=monospace>
-      0c4eb1fa83a7d6ce0e21e5e616a96e83a7b1658170fb544acf6f5c6a2d4b3f90:0
+    <a href=/output/30f2f037629c6a21c1f40ed39b9bd6278df39762d68d07f49582b23bcb23386a:0 class=monospace>
+      30f2f037629c6a21c1f40ed39b9bd6278df39762d68d07f49582b23bcb23386a:0
     </a>
     <dl>
       <dt>value</dt><dd>5000000000</dd>
diff --git a/src/templates/input.rs b/src/templates/input.rs
index e3001b2559..2a8a08acdb 100644
--- a/src/templates/input.rs
+++ b/src/templates/input.rs
@@ -30,7 +30,7 @@ mod tests {
           previous_output: "0000000000000000000000000000000000000000000000000000000000000000:0"
             .parse()
             .unwrap(),
-          script_sig: script::Builder::new().push_scriptint(4).into_script(),
+          script_sig: script::Builder::new().push_slice("foo".as_bytes()).into_script(),
           sequence: Sequence::MAX,
           witness,
         }
@@ -41,8 +41,8 @@ mod tests {
       <dl>
         <dt>previous output</dt><dd class=monospace>0000000000000000000000000000000000000000000000000000000000000000:0</dd>
         <dt>witness</dt><dd class=data>010101</dd>
-        <dt>script sig</dt><dd class=data>OP_PUSHBYTES_1 04</dd>
-        <dt>text</dt><dd>\x01\x04</dd>
+        <dt>script sig</dt><dd class=data>OP_PUSHBYTES_3 666f6f</dd>
+        <dt>text</dt><dd>\x03foo</dd>
       </dl>
       "
       .unindent()
diff --git a/src/templates/output.rs b/src/templates/output.rs
index 7a20d55590..081a31b5a7 100644
--- a/src/templates/output.rs
+++ b/src/templates/output.rs
@@ -64,7 +64,7 @@ mod tests {
         chain: Chain::Mainnet,
         output: TxOut {
           value: 1,
-          script_pubkey: script::Builder::new().push_scriptint(0).into_script(),
+          script_pubkey: script::Builder::new().push_int(0).into_script(),
         },
       }
       .to_string(),
diff --git a/src/templates/transaction.rs b/src/templates/transaction.rs
index d2a49ab278..f49a46773e 100644
--- a/src/templates/transaction.rs
+++ b/src/templates/transaction.rs
@@ -45,11 +45,11 @@ mod tests {
       output: vec![
         TxOut {
           value: 50 * COIN_VALUE,
-          script_pubkey: script::Builder::new().push_scriptint(0).into_script(),
+          script_pubkey: script::Builder::new().push_int(0).into_script(),
         },
         TxOut {
           value: 50 * COIN_VALUE,
-          script_pubkey: script::Builder::new().push_scriptint(1).into_script(),
+          script_pubkey: script::Builder::new().push_int(1).into_script(),
         },
       ],
     };
@@ -57,12 +57,12 @@ mod tests {
     pretty_assert_eq!(
       TransactionHtml::new(transaction, None, Chain::Mainnet).to_string(),
       "
-        <h1>Transaction <span class=monospace>9108ec7cbe9f1231dbf6374251b7267fb31cb23f36ed5a1d7344f5635b17dfe9</span></h1>
+        <h1>Transaction <span class=monospace>9c03542773bfbbf2a951a54e73e2955eeb0e070df07e753e1055de1ea54a74bb</span></h1>
         <h2>2 Outputs</h2>
         <ul class=monospace>
           <li>
-            <a href=/output/9108ec7cbe9f1231dbf6374251b7267fb31cb23f36ed5a1d7344f5635b17dfe9:0 class=monospace>
-              9108ec7cbe9f1231dbf6374251b7267fb31cb23f36ed5a1d7344f5635b17dfe9:0
+            <a href=/output/9c03542773bfbbf2a951a54e73e2955eeb0e070df07e753e1055de1ea54a74bb:0 class=monospace>
+              9c03542773bfbbf2a951a54e73e2955eeb0e070df07e753e1055de1ea54a74bb:0
             </a>
             <dl>
               <dt>value</dt><dd>5000000000</dd>
@@ -70,12 +70,12 @@ mod tests {
             </dl>
           </li>
           <li>
-            <a href=/output/9108ec7cbe9f1231dbf6374251b7267fb31cb23f36ed5a1d7344f5635b17dfe9:1 class=monospace>
-              9108ec7cbe9f1231dbf6374251b7267fb31cb23f36ed5a1d7344f5635b17dfe9:1
+            <a href=/output/9c03542773bfbbf2a951a54e73e2955eeb0e070df07e753e1055de1ea54a74bb:1 class=monospace>
+              9c03542773bfbbf2a951a54e73e2955eeb0e070df07e753e1055de1ea54a74bb:1
             </a>
             <dl>
               <dt>value</dt><dd>5000000000</dd>
-              <dt>script pubkey</dt><dd class=data>OP_PUSHBYTES_1 01</dd>
+              <dt>script pubkey</dt><dd class=data>OP_PUSHNUM_1</dd>
             </dl>
           </li>
         </ul>
diff --git a/test-bitcoincore-rpc/src/state.rs b/test-bitcoincore-rpc/src/state.rs
index 55dc305ec3..707513c78e 100644
--- a/test-bitcoincore-rpc/src/state.rs
+++ b/test-bitcoincore-rpc/src/state.rs
@@ -46,7 +46,7 @@ impl State {
       input: vec![TxIn {
         previous_output: OutPoint::null(),
         script_sig: script::Builder::new()
-          .push_scriptint(self.blocks.len().try_into().unwrap())
+          .push_int(self.blocks.len().try_into().unwrap())
           .into_script(),
         sequence: Sequence::MAX,
         witness: Witness::new(),