Update snapshot test data

ZcashFoundation · Apr 11, 2022 · 1597efc · 1597efc
1 parent c199fe3
commit 1597efc
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 66 deletions.
diff --git a/...vice/finalized_state/disk_format/tests/snapshots/utxo_by_outpoint_raw_data@mainnet_1.snap b/...vice/finalized_state/disk_format/tests/snapshots/utxo_by_outpoint_raw_data@mainnet_1.snap
@@ -9,6 +9,6 @@ expression: cf_data
   ),
   KV(
     k: "0000010000000001",
-    v: "d43000000000000017a9147d46a730d31f97b1930d3368a967c309bd4d136a870000010000000001",
+    v: "d43000000000000017a9147d46a730d31f97b1930d3368a967c309bd4d136a87",
   ),
 ]
diff --git a/...vice/finalized_state/disk_format/tests/snapshots/utxo_by_outpoint_raw_data@mainnet_2.snap b/...vice/finalized_state/disk_format/tests/snapshots/utxo_by_outpoint_raw_data@mainnet_2.snap
@@ -9,14 +9,14 @@ expression: cf_data
   ),
   KV(
     k: "0000010000000001",
-    v: "d43000000000000017a9147d46a730d31f97b1930d3368a967c309bd4d136a870000010000000001",
+    v: "d43000000000000017a9147d46a730d31f97b1930d3368a967c309bd4d136a87",
   ),
   KV(
     k: "0000020000000000",
     v: "a0860100000000002321027a46eb513588b01b37ea24303f4b628afd12cc20df789fede0921e43cad3e875ac",
   ),
   KV(
     k: "0000020000000001",
-    v: "a86100000000000017a9147d46a730d31f97b1930d3368a967c309bd4d136a870000010000000001",
+    v: "a86100000000000017a9147d46a730d31f97b1930d3368a967c309bd4d136a87",
   ),
 ]
diff --git a/...vice/finalized_state/disk_format/tests/snapshots/utxo_by_outpoint_raw_data@testnet_1.snap b/...vice/finalized_state/disk_format/tests/snapshots/utxo_by_outpoint_raw_data@testnet_1.snap
@@ -9,6 +9,6 @@ expression: cf_data
   ),
   KV(
     k: "0000010000000001",
-    v: "d43000000000000017a914ef775f1f997f122a062fff1a2d7443abd1f9c642870000010000000001",
+    v: "d43000000000000017a914ef775f1f997f122a062fff1a2d7443abd1f9c64287",
   ),
 ]
diff --git a/...vice/finalized_state/disk_format/tests/snapshots/utxo_by_outpoint_raw_data@testnet_2.snap b/...vice/finalized_state/disk_format/tests/snapshots/utxo_by_outpoint_raw_data@testnet_2.snap
@@ -9,14 +9,14 @@ expression: cf_data
   ),
   KV(
     k: "0000010000000001",
-    v: "d43000000000000017a914ef775f1f997f122a062fff1a2d7443abd1f9c642870000010000000001",
+    v: "d43000000000000017a914ef775f1f997f122a062fff1a2d7443abd1f9c64287",
   ),
   KV(
     k: "0000020000000000",
     v: "a086010000000000232102acce9f6c16986c525fd34759d851ef5b4b85b5019a57bd59747be0ef1ba62523ac",
   ),
   KV(
     k: "0000020000000001",
-    v: "a86100000000000017a914ef775f1f997f122a062fff1a2d7443abd1f9c642870000010000000001",
+    v: "a86100000000000017a914ef775f1f997f122a062fff1a2d7443abd1f9c64287",
   ),
 ]
diff --git a/zebra-state/src/service/finalized_state/zebra_db/block/tests/snapshots/utxos@mainnet_1.snap b/zebra-state/src/service/finalized_state/zebra_db/block/tests/snapshots/utxos@mainnet_1.snap
@@ -16,30 +16,26 @@ expression: stored_utxos
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(0),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(50000),
       lock_script: Script("21027a46eb513588b01b37ea24303f4b628afd12cc20df789fede0921e43cad3e875ac"),
     ),
-    address_location: None,
+    height: Height(1),
+    from_coinbase: true,
   ))),
   (OutputLocation(
     transaction_location: TransactionLocation(
       height: Height(1),
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(1),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(12500),
       lock_script: Script("a9147d46a730d31f97b1930d3368a967c309bd4d136a87"),
     ),
-    address_location: Some(OutputLocation(
-      transaction_location: TransactionLocation(
-        height: Height(1),
-        index: TransactionIndex(0),
-      ),
-      output_index: OutputIndex(1),
-    )),
+    height: Height(1),
+    from_coinbase: true,
   ))),
 ]
diff --git a/zebra-state/src/service/finalized_state/zebra_db/block/tests/snapshots/utxos@mainnet_2.snap b/zebra-state/src/service/finalized_state/zebra_db/block/tests/snapshots/utxos@mainnet_2.snap
@@ -16,62 +16,54 @@ expression: stored_utxos
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(0),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(50000),
       lock_script: Script("21027a46eb513588b01b37ea24303f4b628afd12cc20df789fede0921e43cad3e875ac"),
     ),
-    address_location: None,
+    height: Height(1),
+    from_coinbase: true,
   ))),
   (OutputLocation(
     transaction_location: TransactionLocation(
       height: Height(1),
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(1),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(12500),
       lock_script: Script("a9147d46a730d31f97b1930d3368a967c309bd4d136a87"),
     ),
-    address_location: Some(OutputLocation(
-      transaction_location: TransactionLocation(
-        height: Height(1),
-        index: TransactionIndex(0),
-      ),
-      output_index: OutputIndex(1),
-    )),
+    height: Height(1),
+    from_coinbase: true,
   ))),
   (OutputLocation(
     transaction_location: TransactionLocation(
       height: Height(2),
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(0),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(100000),
       lock_script: Script("21027a46eb513588b01b37ea24303f4b628afd12cc20df789fede0921e43cad3e875ac"),
     ),
-    address_location: None,
+    height: Height(2),
+    from_coinbase: true,
   ))),
   (OutputLocation(
     transaction_location: TransactionLocation(
       height: Height(2),
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(1),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(25000),
       lock_script: Script("a9147d46a730d31f97b1930d3368a967c309bd4d136a87"),
     ),
-    address_location: Some(OutputLocation(
-      transaction_location: TransactionLocation(
-        height: Height(1),
-        index: TransactionIndex(0),
-      ),
-      output_index: OutputIndex(1),
-    )),
+    height: Height(2),
+    from_coinbase: true,
   ))),
 ]
diff --git a/zebra-state/src/service/finalized_state/zebra_db/block/tests/snapshots/utxos@testnet_1.snap b/zebra-state/src/service/finalized_state/zebra_db/block/tests/snapshots/utxos@testnet_1.snap
@@ -16,30 +16,26 @@ expression: stored_utxos
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(0),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(50000),
       lock_script: Script("21025229e1240a21004cf8338db05679fa34753706e84f6aebba086ba04317fd8f99ac"),
     ),
-    address_location: None,
+    height: Height(1),
+    from_coinbase: true,
   ))),
   (OutputLocation(
     transaction_location: TransactionLocation(
       height: Height(1),
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(1),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(12500),
       lock_script: Script("a914ef775f1f997f122a062fff1a2d7443abd1f9c64287"),
     ),
-    address_location: Some(OutputLocation(
-      transaction_location: TransactionLocation(
-        height: Height(1),
-        index: TransactionIndex(0),
-      ),
-      output_index: OutputIndex(1),
-    )),
+    height: Height(1),
+    from_coinbase: true,
   ))),
 ]
diff --git a/zebra-state/src/service/finalized_state/zebra_db/block/tests/snapshots/utxos@testnet_2.snap b/zebra-state/src/service/finalized_state/zebra_db/block/tests/snapshots/utxos@testnet_2.snap
@@ -16,62 +16,54 @@ expression: stored_utxos
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(0),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(50000),
       lock_script: Script("21025229e1240a21004cf8338db05679fa34753706e84f6aebba086ba04317fd8f99ac"),
     ),
-    address_location: None,
+    height: Height(1),
+    from_coinbase: true,
   ))),
   (OutputLocation(
     transaction_location: TransactionLocation(
       height: Height(1),
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(1),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(12500),
       lock_script: Script("a914ef775f1f997f122a062fff1a2d7443abd1f9c64287"),
     ),
-    address_location: Some(OutputLocation(
-      transaction_location: TransactionLocation(
-        height: Height(1),
-        index: TransactionIndex(0),
-      ),
-      output_index: OutputIndex(1),
-    )),
+    height: Height(1),
+    from_coinbase: true,
   ))),
   (OutputLocation(
     transaction_location: TransactionLocation(
       height: Height(2),
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(0),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(100000),
       lock_script: Script("2102acce9f6c16986c525fd34759d851ef5b4b85b5019a57bd59747be0ef1ba62523ac"),
     ),
-    address_location: None,
+    height: Height(2),
+    from_coinbase: true,
   ))),
   (OutputLocation(
     transaction_location: TransactionLocation(
       height: Height(2),
       index: TransactionIndex(0),
     ),
     output_index: OutputIndex(1),
-  ), Some(UnspentOutputAddressLocation(
+  ), Some(Utxo(
     output: Output(
       value: Amount(25000),
       lock_script: Script("a914ef775f1f997f122a062fff1a2d7443abd1f9c64287"),
     ),
-    address_location: Some(OutputLocation(
-      transaction_location: TransactionLocation(
-        height: Height(1),
-        index: TransactionIndex(0),
-      ),
-      output_index: OutputIndex(1),
-    )),
+    height: Height(2),
+    from_coinbase: true,
   ))),
 ]