Skip to content

Commit 8719fad

Browse files
idky137idky137
committed
fixed for CI
1 parent 27144bd commit 8719fad

File tree

1 file changed

+56
-66
lines changed

1 file changed

+56
-66
lines changed

‎integration-tests/tests/integrations.rs‎

Lines changed: 56 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -3598,9 +3598,6 @@ mod slow {
35983598
}
35993599

36003600
mod basic_transactions {
3601-
#[cfg(feature = "zip317")]
3602-
use std::cmp;
3603-
36043601
use zingo_testutils::scenarios;
36053602
use zingolib::{get_base_address, wallet::Pool};
36063603

@@ -3706,16 +3703,15 @@ mod basic_transactions {
37063703
zingo_testutils::total_tx_value(&faucet, txid1.as_str()).await - 40_000;
37073704
println!("Fee Paid: {}", calculated_fee_txid1);
37083705

3709-
#[cfg(not(feature = "zip317"))]
37103706
let expected_fee_txid1 = 10000;
3711-
#[cfg(feature = "zip317")]
3712-
let expected_fee_txid1 = 5000
3713-
* (cmp::max(
3714-
2,
3715-
tx_actions_txid1.transparent_tx_actions
3716-
+ tx_actions_txid1.sapling_tx_actions
3717-
+ tx_actions_txid1.orchard_tx_actions,
3718-
));
3707+
// currently expected fee is always 10000 but will change to the following in zip317
3708+
// let expected_fee_txid1 = 5000
3709+
// * (cmp::max(
3710+
// 2,
3711+
// tx_actions_txid1.transparent_tx_actions
3712+
// + tx_actions_txid1.sapling_tx_actions
3713+
// + tx_actions_txid1.orchard_tx_actions,
3714+
// ));
37193715
println!("Expected Fee: {}", expected_fee_txid1);
37203716

37213717
assert_eq!(calculated_fee_txid1, expected_fee_txid1 as u64);
@@ -3741,16 +3737,15 @@ mod basic_transactions {
37413737
zingo_testutils::total_tx_value(&faucet, txid2.as_str()).await - 40_000;
37423738
println!("Fee Paid: {}", calculated_fee_txid2);
37433739

3744-
#[cfg(not(feature = "zip317"))]
37453740
let expected_fee_txid2 = 10000;
3746-
#[cfg(feature = "zip317")]
3747-
let expected_fee_txid2 = 5000
3748-
* (cmp::max(
3749-
2,
3750-
tx_actions_txid2.transparent_tx_actions
3751-
+ tx_actions_txid2.sapling_tx_actions
3752-
+ tx_actions_txid2.orchard_tx_actions,
3753-
));
3741+
// currently expected fee is always 10000 but will change to the following in zip317
3742+
// let expected_fee_txid2 = 5000
3743+
// * (cmp::max(
3744+
// 2,
3745+
// tx_actions_txid2.transparent_tx_actions
3746+
// + tx_actions_txid2.sapling_tx_actions
3747+
// + tx_actions_txid2.orchard_tx_actions,
3748+
// ));
37543749
println!("Expected Fee: {}", expected_fee_txid2);
37553750

37563751
assert_eq!(calculated_fee_txid2, expected_fee_txid2 as u64);
@@ -3776,16 +3771,15 @@ mod basic_transactions {
37763771
zingo_testutils::total_tx_value(&faucet, txid3.as_str()).await - 40_000;
37773772
println!("Fee Paid: {}", calculated_fee_txid3);
37783773

3779-
#[cfg(not(feature = "zip317"))]
37803774
let expected_fee_txid3 = 10000;
3781-
#[cfg(feature = "zip317")]
3782-
let expected_fee_txid3 = 5000
3783-
* (cmp::max(
3784-
2,
3785-
tx_actions_txid3.transparent_tx_actions
3786-
+ tx_actions_txid3.sapling_tx_actions
3787-
+ tx_actions_txid3.orchard_tx_actions,
3788-
));
3775+
// currently expected fee is always 10000 but will change to the following in zip317
3776+
// let expected_fee_txid3 = 5000
3777+
// * (cmp::max(
3778+
// 2,
3779+
// tx_actions_txid3.transparent_tx_actions
3780+
// + tx_actions_txid3.sapling_tx_actions
3781+
// + tx_actions_txid3.orchard_tx_actions,
3782+
// ));
37893783
println!("Expected Fee: {}", expected_fee_txid3);
37903784

37913785
assert_eq!(calculated_fee_txid3, expected_fee_txid3 as u64);
@@ -3827,16 +3821,15 @@ mod basic_transactions {
38273821
zingo_testutils::total_tx_value(&recipient, txid4.as_str()).await - 60_000;
38283822
println!("Fee Paid: {}", calculated_fee_txid4);
38293823

3830-
#[cfg(not(feature = "zip317"))]
38313824
let expected_fee_txid4 = 10000;
3832-
#[cfg(feature = "zip317")]
3833-
let expected_fee_txid4 = 5000
3834-
* (cmp::max(
3835-
2,
3836-
tx_actions_txid4.transparent_tx_actions
3837-
+ tx_actions_txid4.sapling_tx_actions
3838-
+ tx_actions_txid4.orchard_tx_actions,
3839-
));
3825+
// currently expected fee is always 10000 but will change to the following in zip317
3826+
// let expected_fee_txid4 = 5000
3827+
// * (cmp::max(
3828+
// 2,
3829+
// tx_actions_txid4.transparent_tx_actions
3830+
// + tx_actions_txid4.sapling_tx_actions
3831+
// + tx_actions_txid4.orchard_tx_actions,
3832+
// ));
38403833
println!("Expected Fee: {}", expected_fee_txid4);
38413834

38423835
assert_eq!(calculated_fee_txid4, expected_fee_txid4 as u64);
@@ -3883,16 +3876,15 @@ mod basic_transactions {
38833876
let calculated_fee_txid1 = zingo_testutils::total_tx_value(&faucet, txid1.as_str()).await;
38843877
println!("Fee Paid: {}", calculated_fee_txid1);
38853878

3886-
#[cfg(not(feature = "zip317"))]
38873879
let expected_fee_txid1 = 10000;
3888-
#[cfg(feature = "zip317")]
3889-
let expected_fee_txid1 = 5000
3890-
* (cmp::max(
3891-
2,
3892-
tx_actions_txid1.transparent_tx_actions
3893-
+ tx_actions_txid1.sapling_tx_actions
3894-
+ tx_actions_txid1.orchard_tx_actions,
3895-
));
3880+
// currently expected fee is always 10000 but will change to the following in zip317
3881+
// let expected_fee_txid1 = 5000
3882+
// * (cmp::max(
3883+
// 2,
3884+
// tx_actions_txid1.transparent_tx_actions
3885+
// + tx_actions_txid1.sapling_tx_actions
3886+
// + tx_actions_txid1.orchard_tx_actions,
3887+
// ));
38963888
println!("Expected Fee: {}", expected_fee_txid1);
38973889

38983890
assert_eq!(calculated_fee_txid1, expected_fee_txid1 as u64);
@@ -3950,16 +3942,15 @@ mod basic_transactions {
39503942
zingo_testutils::total_tx_value(&recipient, txid1.as_str()).await;
39513943
println!("Fee Paid: {}", calculated_fee_txid1);
39523944

3953-
#[cfg(not(feature = "zip317"))]
39543945
let expected_fee_txid1 = 10000;
3955-
#[cfg(feature = "zip317")]
3956-
let expected_fee_txid1 = 5000
3957-
* (cmp::max(
3958-
2,
3959-
tx_actions_txid1.transparent_tx_actions
3960-
+ tx_actions_txid1.sapling_tx_actions
3961-
+ tx_actions_txid1.orchard_tx_actions,
3962-
));
3946+
// currently expected fee is always 10000 but will change to the following in zip317
3947+
// let expected_fee_txid1 = 5000
3948+
// * (cmp::max(
3949+
// 2,
3950+
// tx_actions_txid1.transparent_tx_actions
3951+
// + tx_actions_txid1.sapling_tx_actions
3952+
// + tx_actions_txid1.orchard_tx_actions,
3953+
// ));
39633954
println!("Expected Fee: {}", expected_fee_txid1);
39643955

39653956
assert_eq!(calculated_fee_txid1, expected_fee_txid1 as u64);
@@ -4011,16 +4002,15 @@ mod basic_transactions {
40114002
zingo_testutils::total_tx_value(&recipient, txid2.as_str()).await;
40124003
println!("Fee Paid: {}", calculated_fee_txid2);
40134004

4014-
#[cfg(not(feature = "zip317"))]
40154005
let expected_fee_txid2 = 10000;
4016-
#[cfg(feature = "zip317")]
4017-
let expected_fee_txid2 = 5000
4018-
* (cmp::max(
4019-
2,
4020-
tx_actions_txid2.transparent_tx_actions
4021-
+ tx_actions_txid2.sapling_tx_actions
4022-
+ tx_actions_txid2.orchard_tx_actions,
4023-
));
4006+
// currently expected fee is always 10000 but will change to the following in zip317
4007+
// let expected_fee_txid2 = 5000
4008+
// * (cmp::max(
4009+
// 2,
4010+
// tx_actions_txid2.transparent_tx_actions
4011+
// + tx_actions_txid2.sapling_tx_actions
4012+
// + tx_actions_txid2.orchard_tx_actions,
4013+
// ));
40244014
println!("Expected Fee: {}", expected_fee_txid2);
40254015

40264016
assert_eq!(calculated_fee_txid2, expected_fee_txid2 as u64);

0 commit comments

Comments
 (0)