From da22c5bad28c5e2d938b8d6eb64c92aaefadcc15 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sat, 12 Oct 2024 18:25:34 +0000 Subject: [PATCH] Update to new develop branches with rgb-std/275 fix --- tests/transfers.rs | 2 +- tests/utils/mod.rs | 1 + tests/validation.rs | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/transfers.rs b/tests/transfers.rs index 9e89112..382aa93 100644 --- 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 index 136a0f4..57c8bb7 100644 --- 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 index c43df13..4fb7f19 100644 --- 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())), ], } }