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.

Sign up for GitHub

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

Jump to bottom

removed quick send helper #78

Merged
merged 1 commit into from
Oct 18, 2024
Merged

removed quick send helper #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ license = "Apache-2.0"


[workspace.dependencies]
# Zingolabs
zingolib = { git = "https://github.com/zingolabs/zingolib.git", tag = "zaino_dep_002_091024_95e5b0d8f9d5ee0485c6141533da2f727aeafae2", features = ["zaino-test"] }

# Temporarily removed until dependency conflic can be resolved.
# NymSdk
# nym-sdk = { git = "https://github.com/nymtech/nym", branch = "master" }
Expand Down
1 change: 1 addition & 0 deletions integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ nym_poc = []

[dependencies]
zaino-testutils = { path = "../zaino-testutils" }
zingolib = { workspace = true }

# Miscellaneous Workspace
tokio = { workspace = true }
28 changes: 15 additions & 13 deletions integration-tests/tests/integrations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
use std::sync::{atomic::AtomicBool, Arc};
use zaino_testutils::{
drop_test_manager,
zingo_lightclient::{get_address, quick_send, start_mempool_monitor},
zingo_lightclient::{get_address, start_mempool_monitor},
TestManager,
};

mod wallet_basic {
use zingolib::testutils::lightclient::from_inputs;

use super::*;

#[tokio::test]
Expand Down Expand Up @@ -41,7 +43,7 @@ mod wallet_basic {
test_manager.regtest_manager.generate_n_blocks(1).unwrap();
zingo_client.do_sync(false).await.unwrap();

quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(&get_address(&zingo_client, "unified").await, 250_000, None)],
)
Expand Down Expand Up @@ -71,7 +73,7 @@ mod wallet_basic {

test_manager.regtest_manager.generate_n_blocks(1).unwrap();
zingo_client.do_sync(false).await.unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(&get_address(&zingo_client, "sapling").await, 250_000, None)],
)
Expand Down Expand Up @@ -101,7 +103,7 @@ mod wallet_basic {

test_manager.regtest_manager.generate_n_blocks(1).unwrap();
zingo_client.do_sync(false).await.unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(
&get_address(&zingo_client, "transparent").await,
Expand Down Expand Up @@ -135,19 +137,19 @@ mod wallet_basic {

test_manager.regtest_manager.generate_n_blocks(2).unwrap();
zingo_client.do_sync(false).await.unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(&get_address(&zingo_client, "unified").await, 250_000, None)],
)
.await
.unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(&get_address(&zingo_client, "sapling").await, 250_000, None)],
)
.await
.unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(
&get_address(&zingo_client, "transparent").await,
Expand Down Expand Up @@ -183,7 +185,7 @@ mod wallet_basic {

test_manager.regtest_manager.generate_n_blocks(1).unwrap();
zingo_client.do_sync(false).await.unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(
&get_address(&zingo_client, "transparent").await,
Expand Down Expand Up @@ -228,22 +230,22 @@ mod wallet_basic {
zingo_client.do_sync(false).await.unwrap();

test_manager.regtest_manager.generate_n_blocks(5).unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(&get_address(&zingo_client, "unified").await, 250_000, None)],
)
.await
.unwrap();
test_manager.regtest_manager.generate_n_blocks(15).unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(&get_address(&zingo_client, "sapling").await, 250_000, None)],
)
.await
.unwrap();

test_manager.regtest_manager.generate_n_blocks(15).unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(
&get_address(&zingo_client, "transparent").await,
Expand Down Expand Up @@ -281,13 +283,13 @@ mod wallet_basic {

test_manager.regtest_manager.generate_n_blocks(1).unwrap();
zingo_client.do_sync(false).await.unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(&get_address(&zingo_client, "sapling").await, 250_000, None)],
)
.await
.unwrap();
quick_send(
from_inputs::quick_send(
&zingo_client,
vec![(&get_address(&zingo_client, "sapling").await, 250_000, None)],
)
Expand Down
2 changes: 1 addition & 1 deletion zaino-testutils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ zaino-fetch = { path = "../zaino-fetch" }
zainod = { path = "../zainod" }

# ZingoLib
zingolib = { git = "https://github.com/zingolabs/zingolib.git", tag = "zaino_dep_002_091024_95e5b0d8f9d5ee0485c6141533da2f727aeafae2", features = ["zaino-test"] }
zingolib = { workspace = true }
# zingolib = { git = "https://github.com/idky137/zingolib.git", branch = "zaino_temp_dep", features = ["zaino-test"] }
# zingolib = { path = "../../zingolib/zingolib", features = ["zaino-test"] }

Expand Down
12 changes: 0 additions & 12 deletions zaino-testutils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,6 @@ pub mod zingo_lightclient {
zingolib::get_base_address_macro!(zingo_client, pool)
}

/// Sends funds to address given, handles proposals internally.
///
/// recievers should be in the form vec![Address, Amount, Option<Memo>]
pub async fn quick_send(
zingo_client: &zingolib::lightclient::LightClient,
receivers: Vec<(&str, u64, Option<&str>)>,
) -> Result<String, zingolib::lightclient::send::send_with_proposal::QuickSendError> {
zingolib::testutils::lightclient::from_inputs::quick_send(zingo_client, receivers)
.await
.map(|tx_ids| tx_ids.into_iter().next().unwrap().to_string())
}

/// Starts Zingolib::lightclients's mempool monitor.
pub async fn start_mempool_monitor(zingo_client: &zingolib::lightclient::LightClient) {
let zingo_client_saved = zingo_client.export_save_buffer_async().await.unwrap();
Expand Down
Loading