Update to new develop branches with rgb-std/275 fix

RGB-WG · Oct 12, 2024 · da22c5b · da22c5b
1 parent 1c27e9c
commit da22c5b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/tests/transfers.rs b/tests/transfers.rs
@@ -793,7 +793,7 @@ fn tapret_wlt_receiving_opret() {
         TransferType::Blinded,
         contract_id,
         &iface_type_name,
-        600,
+        570,
         1000,
         None,
     );

diff --git a/tests/utils/mod.rs b/tests/utils/mod.rs
@@ -21,6 +21,7 @@ pub use std::{
     fmt::{self, Display},
     fs::OpenOptions,
     io::Write,
+    num::NonZeroU32,
     path::{PathBuf, MAIN_SEPARATOR},
     process::{Command, Stdio},
     str::FromStr,

diff --git a/tests/validation.rs b/tests/validation.rs
@@ -76,9 +76,9 @@ impl Scenario {
                         witness_id_3 => MockResolvePubWitness::Success(tx_3),
                     ],
                     pub_witness_ords: map![
-                        witness_id_1 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::new(106, 1726062111).unwrap())),
-                        witness_id_2 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::new(108, 1726062111).unwrap())),
-                        witness_id_3 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::new(110, 1726062112).unwrap())),
+                        witness_id_1 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::bitcoin(NonZeroU32::new(106).unwrap(), 1726062111).unwrap())),
+                        witness_id_2 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::bitcoin(NonZeroU32::new(108).unwrap(), 1726062111).unwrap())),
+                        witness_id_3 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::bitcoin(NonZeroU32::new(110).unwrap(), 1726062112).unwrap())),
                     ],
                 }
             }
@@ -96,9 +96,9 @@ impl Scenario {
                         witness_id_3 => MockResolvePubWitness::Success(tx_3),
                     ],
                     pub_witness_ords: map![
-                        witness_id_1 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::new(105, 1726062423).unwrap())),
-                        witness_id_2 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::new(106, 1726062423).unwrap())),
-                        witness_id_3 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::new(106, 1726062423).unwrap())),
+                        witness_id_1 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::bitcoin(NonZeroU32::new(105).unwrap(), 1726062423).unwrap())),
+                        witness_id_2 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::bitcoin(NonZeroU32::new(106).unwrap(), 1726062423).unwrap())),
+                        witness_id_3 => MockResolvePubWitnessOrd::Success(WitnessOrd::Mined(WitnessPos::bitcoin(NonZeroU32::new(106).unwrap(), 1726062423).unwrap())),
                     ],
                 }
             }