Skip to content

Commit

Permalink
uncomment tendermint docker and cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
@borngraced
borngraced committed Feb 26, 2025
1 parent 92504d4 commit 7fe0a49
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 30 deletions.
12 changes: 5 additions & 7 deletions mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ pub struct ZCoinAssetDockerOps {
impl CoinDockerOps for ZCoinAssetDockerOps {
fn rpc_client(&self) -> &UtxoRpcClientEnum { &self.coin.as_ref().rpc_client }
fn wait_ready(&self, expected_tx_version: i32) {
let timeout = wait_until_ms(150000);
let timeout = wait_until_ms(120000);
log!("Waiting for ZOMBIE coinbase tx");
loop {
match block_on_f01(self.rpc_client().get_block_count()) {
Expand All @@ -263,7 +263,7 @@ impl CoinDockerOps for ZCoinAssetDockerOps {
let coinbase = block_on_f01(client.get_verbose_transaction(&block.tx[0])).unwrap();
log!("Coinbase tx {:?} in block {}", coinbase, n);
if coinbase.version == expected_tx_version {
//send funds to our shielded address.
//send funds to test shielded address.
let _ =block_on(client.z_shieldcoinbase(
&coinbase.vout[0].script.addresses[0],
"zs10hvyxf3ajm82e4gvxem3zjlf9xf3yxhjww9fvz3mfqza9zwumvluzy735e29c3x5aj2nu0ua6n0"
Expand All @@ -282,9 +282,9 @@ impl CoinDockerOps for ZCoinAssetDockerOps {
}

impl ZCoinAssetDockerOps {
pub fn from_ticker(ticker: &str) -> ZCoinAssetDockerOps {
pub fn from_ticker(_ticker: &str) -> ZCoinAssetDockerOps {
let ctx = MmCtxBuilder::new().into_mm_arc();
let conf = zombie_conf();
let mut conf = zombie_conf();
let params = native_zcoin_activation_params();
let pk_data = [1; 32];
let db_dir = prepare_runtime_dir().unwrap();
Expand All @@ -305,8 +305,6 @@ impl ZCoinAssetDockerOps {
))
.unwrap();

println!("z_addr: {}", coin.my_z_address_encoded());

ZCoinAssetDockerOps { ctx, coin }
}
}
Expand Down Expand Up @@ -554,7 +552,7 @@ pub fn ibc_relayer_node(docker: &'_ Cli, runtime_dir: PathBuf) -> DockerNode<'_>
}

pub fn pirate_asset_docker_node<'a>(docker: &'a Cli, ticker: &'static str, port: u16) -> DockerNode<'a> {
let mut image = GenericImage::new(ZOMBIE_ASSET_DOCKER_IMAGE, "latest")
let image = GenericImage::new(ZOMBIE_ASSET_DOCKER_IMAGE, "latest")
.with_volume(zcash_params_path().display().to_string(), "/root/.zcash-params")
.with_env_var("CLIENTS", "2")
.with_env_var("COIN_RPC_PORT", port.to_string())
Expand Down
22 changes: 13 additions & 9 deletions mm2src/mm2_main/tests/docker_tests/z_coin_docker_tests.rs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
use crate::docker_tests::docker_tests_common::z_coin_from_spending_key;

use bitcrypto::dhash160;
use coins::{coin_errors::ValidatePaymentError,
z_coin::{z_send_dex_fee, ZTransaction},
DexFee, RefundPaymentArgs, SendPaymentArgs, SpendPaymentArgs, SwapOps, SwapTxTypeWithSecretHash,
ValidateFeeArgs};
use common::{executor::Timer, now_sec};
use coins::{coin_errors::ValidatePaymentError, z_coin::z_send_dex_fee, DexFee, MarketCoinOps, RefundPaymentArgs,
SendPaymentArgs, SpendPaymentArgs, SwapOps, SwapTxTypeWithSecretHash, ValidateFeeArgs};
use common::{executor::Timer, now_sec, Future01CompatExt};
use mm2_number::MmNumber;

#[tokio::test(flavor = "multi_thread")]
Expand Down Expand Up @@ -112,10 +110,15 @@ async fn zombie_coin_send_dex_fee() {
log!("dex fee tx {}", tx.txid());
}

// TODO: fix test
#[ignore]
#[tokio::test(flavor = "multi_thread")]
async fn zombie_coin_validate_dex_fee() {
let (_ctx, coin) = z_coin_from_spending_key("secret-extended-key-main1q0k2ga2cqqqqpq8m8j6yl0say83cagrqp53zqz54w38ezs8ly9ly5ptamqwfpq85u87w0df4k8t2lwyde3n9v0gcr69nu4ryv60t0kfcsvkr8h83skwqex2nf0vr32794fmzk89cpmjptzc22lgu5wfhhp8lgf3f5vn2l3sge0udvxnm95k6dtxj2jwlfyccnum7nz297ecyhmd5ph526pxndww0rqq0qly84l635mec0x4yedf95hzn6kcgq8yxts26k98j9g32kjc8y83fe").await;

let balance = coin.my_balance().compat().await;
println!("BALANCE: {balance:?}");

let tx = z_send_dex_fee(&coin, "0.01".parse().unwrap(), &[1; 16]).await.unwrap();
log!("dex fee tx {}", tx.txid());
let tx = tx.into();
Expand All @@ -125,7 +128,7 @@ async fn zombie_coin_validate_dex_fee() {
expected_sender: &[],
fee_addr: &[],
dex_fee: &DexFee::Standard(MmNumber::from("0.001")),
min_block_number: 12000,
min_block_number: 10,
uuid: &[1; 16],
};
// Invalid amount should return an error
Expand All @@ -141,7 +144,7 @@ async fn zombie_coin_validate_dex_fee() {
expected_sender: &[],
fee_addr: &[],
dex_fee: &DexFee::Standard(MmNumber::from("0.01")),
min_block_number: 12000,
min_block_number: 10,
uuid: &[2; 16],
};
let err = coin.validate_fee(validate_fee_args).await.unwrap_err().into_inner();
Expand All @@ -156,7 +159,7 @@ async fn zombie_coin_validate_dex_fee() {
expected_sender: &[],
fee_addr: &[],
dex_fee: &DexFee::Standard(MmNumber::from("0.01")),
min_block_number: 810617,
min_block_number: 20000,
uuid: &[1; 16],
};
let err = coin.validate_fee(validate_fee_args).await.unwrap_err().into_inner();
Expand All @@ -165,13 +168,14 @@ async fn zombie_coin_validate_dex_fee() {
_ => panic!("Expected `WrongPaymentTx`: {:?}", err),
}

println!("LAST STAGE");
// Success validation
let validate_fee_args = ValidateFeeArgs {
fee_tx: &tx,
expected_sender: &[],
fee_addr: &[],
dex_fee: &DexFee::Standard(MmNumber::from("0.01")),
min_block_number: 12000,
min_block_number: 10,
uuid: &[1; 16],
};
coin.validate_fee(validate_fee_args).await.unwrap();
Expand Down
27 changes: 13 additions & 14 deletions mm2src/mm2_main/tests/docker_tests_main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,49 +65,48 @@ pub fn docker_tests_runner(tests: &[&TestDescAndFn]) {
remove_docker_containers(image);
}

// let runtime_dir = prepare_runtime_dir().unwrap();
let runtime_dir = prepare_runtime_dir().unwrap();

// let nucleus_node = nucleus_node(&docker, runtime_dir.clone());
// let atom_node = atom_node(&docker, runtime_dir.clone());
// let ibc_relayer_node = ibc_relayer_node(&docker, runtime_dir);
let pirate_node = pirate_asset_docker_node(&docker, "ZOMBIE", 7090);
let nucleus_node = nucleus_node(&docker, runtime_dir.clone());
let atom_node = atom_node(&docker, runtime_dir.clone());
let ibc_relayer_node = ibc_relayer_node(&docker, runtime_dir);
let utxo_node = utxo_asset_docker_node(&docker, "MYCOIN", 7000);
let utxo_node1 = utxo_asset_docker_node(&docker, "MYCOIN1", 8000);
let qtum_node = qtum_docker_node(&docker, 9000);
let for_slp_node = utxo_asset_docker_node(&docker, "FORSLP", 10000);
let geth_node = geth_docker_node(&docker, "ETH", 8545);
let pirate_node = pirate_asset_docker_node(&docker, "ZOMBIE", 7090);

let runtime_dir = prepare_runtime_dir().unwrap();
let pirate_ops = ZCoinAssetDockerOps::from_ticker("ZOMBIE");
let utxo_ops = UtxoAssetDockerOps::from_ticker("MYCOIN");
let utxo_ops1 = UtxoAssetDockerOps::from_ticker("MYCOIN1");
let qtum_ops = QtumDockerOps::new();
let for_slp_ops = BchDockerOps::from_ticker("FORSLP");
let pirate_ops = ZCoinAssetDockerOps::from_ticker("ZOMBIE");

pirate_ops.wait_ready(4);
qtum_ops.wait_ready(2);
qtum_ops.initialize_contracts();
for_slp_ops.wait_ready(4);
for_slp_ops.initialize_slp();
utxo_ops.wait_ready(4);
utxo_ops1.wait_ready(4);
pirate_ops.wait_ready(4);

wait_for_geth_node_ready();
init_geth_node();
// prepare_ibc_channels(ibc_relayer_node.container.id());
prepare_ibc_channels(ibc_relayer_node.container.id());

thread::sleep(Duration::from_secs(10));
// wait_until_relayer_container_is_ready(ibc_relayer_node.container.id());
wait_until_relayer_container_is_ready(ibc_relayer_node.container.id());

containers.push(pirate_node);
containers.push(utxo_node);
containers.push(utxo_node1);
containers.push(qtum_node);
containers.push(for_slp_node);
containers.push(geth_node);
// containers.push(nucleus_node);
// containers.push(atom_node);
// containers.push(ibc_relayer_node);
containers.push(nucleus_node);
containers.push(atom_node);
containers.push(ibc_relayer_node);
containers.push(pirate_node);
}
// detect if docker is installed
// skip the tests that use docker if not installed
Expand Down

0 comments on commit 7fe0a49

Please sign in to comment.