absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 20:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

dockertest 0.4 (#406)

Browse Source 
* Updates to modern dockertest

* More updates to latest dockertest

* Update Cargo.lock to dockertest with handle restored

* clippy coordinator tests

* clippy full-stack tests

* Remove kayabaNerve branch for official repo's latest commit hash

* Update serai-client, remove reliance on the existence of a handle fn

* Don't use the hex encoding of unique_id in dockertests

Gets our hostnames just below 64 bytes, resolving test failures on at least
Debian-based systems.

* Use Network::Isolated for all dockertest instances

* Correct error from prior commit's edits
This commit is contained in:
Luke Parker
2023-10-23 06:59:38 -04:00
committed by GitHub
parent 0d23964762
commit c4bdbdde11
17 changed files with 178 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/processor/src/networks.rs
View File

@@ -11,7 +11,7 @@ use serai_client::{
in_instructions::primitives::{InInstruction, RefundableInInstruction, Shorthand},
};
use dockertest::{PullPolicy, Image, StartPolicy, Composition, DockerOperations};
use dockertest::{PullPolicy, Image, StartPolicy, TestBodySpecification, DockerOperations};
use crate::*;
@@ -21,13 +21,13 @@ pub const RPC_PASS: &str = "seraidex";
pub const BTC_PORT: u32 = 8332;
pub const XMR_PORT: u32 = 18081;
pub fn bitcoin_instance() -> (Composition, u32) {
pub fn bitcoin_instance() -> (TestBodySpecification, u32) {
serai_docker_tests::build("bitcoin".to_string());
let mut composition = Composition::with_image(
let composition = TestBodySpecification::with_image(
Image::with_repository("serai-dev-bitcoin").pull_policy(PullPolicy::Never),
)
.with_cmd(vec![
.replace_cmd(vec![
"bitcoind".to_string(),
"-txindex".to_string(),
"-regtest".to_string(),
@@ -36,18 +36,18 @@ pub fn bitcoin_instance() -> (Composition, u32) {
"-rpcbind=0.0.0.0".to_string(),
"-rpcallowip=0.0.0.0/0".to_string(),
"-rpcport=8332".to_string(),
]);
composition.publish_all_ports();
])
.set_publish_all_ports(true);
(composition, BTC_PORT)
}
pub fn monero_instance() -> (Composition, u32) {
pub fn monero_instance() -> (TestBodySpecification, u32) {
serai_docker_tests::build("monero".to_string());
let mut composition = Composition::with_image(
let composition = TestBodySpecification::with_image(
Image::with_repository("serai-dev-monero").pull_policy(PullPolicy::Never),
)
.with_cmd(vec![
.replace_cmd(vec![
"monerod".to_string(),
"--regtest".to_string(),
"--offline".to_string(),
@@ -58,12 +58,12 @@ pub fn monero_instance() -> (Composition, u32) {
"--confirm-external-bind".to_string(),
"--non-interactive".to_string(),
])
.with_start_policy(StartPolicy::Strict);
composition.publish_all_ports();
.set_start_policy(StartPolicy::Strict)
.set_publish_all_ports(true);
(composition, XMR_PORT)
}
pub fn network_instance(network: NetworkId) -> (Composition, u32) {
pub fn network_instance(network: NetworkId) -> (TestBodySpecification, u32) {
match network {
NetworkId::Bitcoin => bitcoin_instance(),
NetworkId::Ethereum => todo!(),