From d63b7afa4bb668a59e6a99b2d3759376a45d7fc5 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Fri, 19 Jan 2024 17:37:41 +0100 Subject: [PATCH 1/3] SFT-3190: Fix foundation-ur tests. Signed-off-by: Jean-Pierre De Jesus DIAZ --- ur/Cargo.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ur/Cargo.toml b/ur/Cargo.toml index c580e07..bcda876 100644 --- a/ur/Cargo.toml +++ b/ur/Cargo.toml @@ -21,8 +21,10 @@ alloc = ["minicbor/alloc"] bitcoin_hashes = { workspace = true } crc = { workspace = true } heapless = { workspace = true } -hex = { workspace = true } itertools = { workspace = true } minicbor = { workspace = true } phf = { workspace = true } rand_xoshiro = { workspace = true } + +[dev-dependencies] +hex = { workspace = true, features = ["alloc"] } From 2552b4b160cc4f962a543e5fed48885af5a88bf9 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Fri, 19 Jan 2024 17:37:51 +0100 Subject: [PATCH 2/3] SFT-3190: Fix name clash. Signed-off-by: Jean-Pierre De Jesus DIAZ --- ur/src/len.rs | 2 +- ur/src/ur/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ur/src/len.rs b/ur/src/len.rs index 70ff39d..c60479a 100644 --- a/ur/src/len.rs +++ b/ur/src/len.rs @@ -65,7 +65,7 @@ const fn digit_count(mut v: usize) -> usize { } #[cfg(test)] -pub mod tests { +mod tests { use super::*; #[test] diff --git a/ur/src/ur/mod.rs b/ur/src/ur/mod.rs index a987102..4f72bca 100644 --- a/ur/src/ur/mod.rs +++ b/ur/src/ur/mod.rs @@ -255,7 +255,7 @@ pub fn to_string(ur_type: &str, message: &[u8]) -> alloc::string::String { } #[cfg(test)] -pub mod tests { +mod tests { use super::*; use core::num::IntErrorKind; From 785576238660ca8fdfbce4165bbcb0c24b4eefd3 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Fri, 19 Jan 2024 17:38:50 +0100 Subject: [PATCH 3/3] SFT-3190: Update minicbor to 0.20. Signed-off-by: Jean-Pierre De Jesus DIAZ --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 221a37b..011d23c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ heapless = { version = "0.8", default-features = false } hex = { version = "0.4.2", default-features = false } itertools = { version = "0.10", default-features = false } libfuzzer-sys = "0.4" -minicbor = { version = "0.19.1", features = ["derive"] } +minicbor = { version = "0.20", features = ["derive"] } phf = { version = "0.11", features = ["macros"], default-features = false } rand_xoshiro = "0.6" serde = { version = "1.0.156", features = ["derive"] }