feat: use new references for zcash tools on tests (#132)

* feat: use new references for zcash tools on tests * chore: bump app version * chore: bump snapshots
Zondax · Nov 27, 2024 · 6f4429a · 6f4429a
1 parent c2a9c9f
commit 6f4429a
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 29 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=4
 # This is the minor version
 APPVERSION_N=2
 # This is the patch version
-APPVERSION_P=3
+APPVERSION_P=4
diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
diff --git a/zcashtools/Cargo.lock b/zcashtools/Cargo.lock
diff --git a/zcashtools/Cargo.toml b/zcashtools/Cargo.toml
@@ -8,8 +8,8 @@ opt-level = "s"
 overflow-checks = true
 
 [patch.crates-io]
-ledger-zcash-builder = { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "3bad2fa4a7870270627edc25ebdb5b4818fd1855" }
-ledger-zcash = { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "3bad2fa4a7870270627edc25ebdb5b4818fd1855" }
+ledger-zcash-chain-builder = { git = "https://github.com/Zondax/ledger-zcash-tools", tag = "v2.0.0" }
+ledger-zcash-app-builder = { git = "https://github.com/Zondax/ledger-zcash-tools", tag = "v2.0.0" }
 
-# ledger-zcash-builder = { path = "../../ledger-zcash-rs/ledger-zcash-builder" }
-# ledger-zcash = { path = "../../ledger-zcash-rs/ledger-zcash" }
+# ledger-zcash-chain-builder = { path = "../../ledger-zcash-tools/ledger-zcash-chain-builder" }
+# ledger-zcash-app-builder = { path = "../../ledger-zcash-tools/ledger-zcash-app-builder" }
diff --git a/zcashtools/neon/native/Cargo.toml b/zcashtools/neon/native/Cargo.toml
@@ -19,14 +19,14 @@ serde_derive = "1"
 serde = "1"
 log = "0.4"
 snafu = { version = "0.8.2" }
-zcash_primitives = { git = "https://github.com/Zondax/librustzcash", rev = "112eedd27b2e51b9e1b77603a776cd78e738c3ae", features = ["transparent-inputs"], package = "zcash_primitives" }
+zcash_primitives = { git = "https://github.com/Zondax/librustzcash", rev = "ce278848fef35903db46c3dced41658e90bbeb3c", features = ["transparent-inputs"], package = "zcash_primitives" }
 
 neon-serde = { git = "https://github.com/Zondax/neon-serde", branch = "master", default-features = false, features = [
     "napi-6",
 ] }
 
-ledger-zcash-builder = { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "3bad2fa4a7870270627edc25ebdb5b4818fd1855", package = "ledger-zcash-builder"  }
-ledger-zcash =  { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "3bad2fa4a7870270627edc25ebdb5b4818fd1855", package = "ledger-zcash"  }
+ledger-zcash-chain-builder = { git = "https://github.com/Zondax/ledger-zcash-tools", tag = "v2.0.0", package = "ledger-zcash-chain-builder"  }
+ledger-zcash-app-builder =  { git = "https://github.com/Zondax/ledger-zcash-tools", tag = "v2.0.0", package = "ledger-zcash-app-builder"  }
 
 [dev-dependencies]
 serde = { version = "1", features = ["derive"] }

diff --git a/zcashtools/neon/native/src/lib.rs b/zcashtools/neon/native/src/lib.rs
@@ -1,9 +1,9 @@
-use ledger_zcash_builder::data::{
+use ledger_zcash_chain_builder::data::{
     HsmTxData, InitData, OutputBuilderInfo, SpendBuilderInfo, TransactionSignatures,
     TransparentInputBuilderInfo, TransparentOutputBuilderInfo,
 };
-use ledger_zcash_builder::errors::Error;
-use ledger_zcash_builder::{hsmauth, txbuilder, txprover};
+use ledger_zcash_chain_builder::errors::Error;
+use ledger_zcash_chain_builder::{hsmauth, txbuilder, txprover};
 use neon::prelude::*;
 use std::cell::RefCell;
 use std::path::Path;
@@ -45,7 +45,7 @@ fn calculate_zip0317_fee(mut cx: FunctionContext) -> JsResult<JsNumber> {
     ];
 
     let fee: u64 =
-        ledger_zcash::builder::Builder::calculate_zip0317_fee(n_tin, n_tout, n_spend, n_sout)
+        ledger_zcash_app_builder::builder::Builder::calculate_zip0317_fee(n_tin, n_tout, n_spend, n_sout)
             .into();
 
     Ok(cx.number(fee as f64))

diff --git a/zcashtools/neon/native/tests/builder_test.rs b/zcashtools/neon/native/tests/builder_test.rs
@@ -1,6 +1,6 @@
 use env_logger::Env;
-use ledger_zcash::builder::Builder as ZcashBuilder;
-use ledger_zcash_builder::{
+use ledger_zcash_app_builder::builder::Builder as ZcashBuilder;
+use ledger_zcash_chain_builder::{
     data::{OutputBuilderInfo, SpendBuilderInfo},
     txbuilder::Builder,
 };

diff --git a/zcashtools/neon/native/tests/builder_test2.rs b/zcashtools/neon/native/tests/builder_test2.rs
@@ -1,6 +1,6 @@
 use env_logger::Env;
-use ledger_zcash::builder::Builder as ZcashBuilder;
-use ledger_zcash_builder::{
+use ledger_zcash_app_builder::builder::Builder as ZcashBuilder;
+use ledger_zcash_chain_builder::{
     data::{TransparentInputBuilderInfo, TransparentOutputBuilderInfo},
     txbuilder::Builder,
 };