Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: resolve tests in output_manager_service_tests.rs (see issue #4561) #4577

Merged
Merged
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
000d939
clear pending coinbase transactions now rely on utxo hashes
jorgeantonio21 Aug 3, 2022
3a93730
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 3, 2022
af7843d
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 4, 2022
d9a9d1c
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 5, 2022
468aff6
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 8, 2022
aa225a4
sync with dev
jorgeantonio21 Aug 8, 2022
68ec0b2
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 9, 2022
6edf4fb
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 9, 2022
265821d
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 11, 2022
39d3309
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 11, 2022
73bb978
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 11, 2022
aeb9184
changes
jorgeantonio21 Aug 12, 2022
2047081
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 15, 2022
839673d
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 16, 2022
053f3a7
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 16, 2022
0b75544
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 17, 2022
686719b
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 17, 2022
e995f82
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 18, 2022
3277cd6
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 18, 2022
f68ede4
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 18, 2022
8013468
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 18, 2022
2939edb
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 22, 2022
f4ddea2
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 22, 2022
756498c
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 22, 2022
31608ed
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 23, 2022
68b8e56
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 24, 2022
6789c10
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 29, 2022
a111d8e
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 29, 2022
71cd554
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 30, 2022
70f4608
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 30, 2022
e0db1b4
Merge branch 'development' of github.com:jorgeantonio21/tari into dev…
jorgeantonio21 Aug 30, 2022
8d9aa74
resolve tests
jorgeantonio21 Aug 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ async fn fee_estimate() {
assert!(matches!(err, OutputManagerError::NotEnoughFunds));
}

#[ignore]
#[allow(clippy::identity_op)]
#[tokio::test]
async fn test_utxo_selection_no_chain_metadata() {
Expand Down Expand Up @@ -492,7 +491,7 @@ async fn test_utxo_selection_no_chain_metadata() {
let (_, tx, utxos_total_value) = oms.create_coin_split(vec![], amount, 5, fee_per_gram).await.unwrap();
let expected_fee = fee_calc.calculate(fee_per_gram, 1, 1, 6, default_metadata_byte_size() * 6);
assert_eq!(tx.body.get_total_fee(), expected_fee);
assert_eq!(utxos_total_value, MicroTari::from(10_000));
assert_eq!(utxos_total_value, MicroTari::from(5_000));

// test that largest utxo was encumbered
let utxos = oms.get_unspent_outputs().await.unwrap();
Expand All @@ -507,7 +506,6 @@ async fn test_utxo_selection_no_chain_metadata() {
#[tokio::test]
#[allow(clippy::identity_op)]
#[allow(clippy::too_many_lines)]
#[ignore]
async fn test_utxo_selection_with_chain_metadata() {
let factories = CryptoFactories::default();
let (connection, _tempdir) = get_temp_sqlite_database_connection();
Expand Down Expand Up @@ -576,7 +574,7 @@ async fn test_utxo_selection_with_chain_metadata() {

// test coin split is maturity aware
let (_, tx, utxos_total_value) = oms.create_coin_split(vec![], amount, 5, fee_per_gram).await.unwrap();
assert_eq!(utxos_total_value, MicroTari::from(6_000));
assert_eq!(utxos_total_value, MicroTari::from(5_000));
let expected_fee = fee_calc.calculate(fee_per_gram, 1, 1, 6, default_metadata_byte_size() * 6);
assert_eq!(tx.body.get_total_fee(), expected_fee);

Expand Down Expand Up @@ -1113,7 +1111,6 @@ async fn sending_transaction_persisted_while_offline() {
}

#[tokio::test]
#[ignore]
async fn coin_split_with_change() {
let factories = CryptoFactories::default();
let (connection, _tempdir) = get_temp_sqlite_database_connection();
Expand Down