Skip to content

Commit c2dcd26

Browse files
authored
Merge pull request #1 from zancas/cross_version
start feature gate
2 parents b4197ca + 6851612 commit c2dcd26

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

cli/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ tempdir = "0.3.7"
2323
tracing-subscriber = "0.3.15"
2424
zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346"}
2525
zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346", features = ["transparent-inputs", "test-dependencies"] }
26+
27+
[features]
28+
cross_version = []

cli/tests/integration_tests.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -488,9 +488,13 @@ fn ensure_taddrs_from_old_seeds_work() {
488488
// The first taddr generated on commit 9e71a14eb424631372fd08503b1bd83ea763c7fb
489489
let transparent_address = "tmFLszfkjgim4zoUMAXpuohnFBAKy99rr2i";
490490

491-
let client_b =
492-
LightClient::create_with_seedorkey_wallet(TEST_SEED.to_string(), &client_b_config, 0, false)
493-
.unwrap();
491+
let client_b = LightClient::create_with_seedorkey_wallet(
492+
TEST_SEED.to_string(),
493+
&client_b_config,
494+
0,
495+
false,
496+
)
497+
.unwrap();
494498

495499
Runtime::new().unwrap().block_on(async {
496500
client_b.do_new_address("zt").await.unwrap();
@@ -521,10 +525,10 @@ fn ensure_taddrs_from_old_seeds_work() {
521525
// The test-or-scenario that caused this situation has failed/panicked.
522526
//}
523527

524-
/// TODO: feature gate
528+
#[cfg(feature = "cross_version")]
525529
mod cross_version {
526530
#[test]
527531
fn cross_compat() {
528532
assert_eq!(0, 0);
529533
}
530-
}
534+
}

0 commit comments

Comments
 (0)