absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 04:09: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

2
tests/message-queue/Cargo.toml
View File

@@ -25,5 +25,5 @@ serai-primitives = { path = "../../substrate/primitives" }
serai-message-queue = { path = "../../message-queue" }
tokio = { version = "1", features = ["time"] }
dockertest = "0.3"
dockertest = "0.4"
serai-docker-tests = { path = "../docker" }

20
tests/message-queue/src/lib.rs
View File

@@ -9,11 +9,13 @@ use ciphersuite::{
use serai_primitives::NetworkId;
use dockertest::{PullPolicy, Image, LogAction, LogPolicy, LogSource, LogOptions, Composition};
use dockertest::{
PullPolicy, Image, LogAction, LogPolicy, LogSource, LogOptions, TestBodySpecification,
};
pub type MessageQueuePrivateKey = <Ristretto as Ciphersuite>::F;
pub fn instance(
) -> (MessageQueuePrivateKey, HashMap<NetworkId, MessageQueuePrivateKey>, Composition) {
) -> (MessageQueuePrivateKey, HashMap<NetworkId, MessageQueuePrivateKey>, TestBodySpecification) {
serai_docker_tests::build("message-queue".to_string());
let coord_key = <Ristretto as Ciphersuite>::F::random(&mut OsRng);
@@ -23,15 +25,15 @@ pub fn instance(
(NetworkId::Monero, <Ristretto as Ciphersuite>::F::random(&mut OsRng)),
]);
let mut composition = Composition::with_image(
let composition = TestBodySpecification::with_image(
Image::with_repository("serai-dev-message-queue").pull_policy(PullPolicy::Never),
)
.with_log_options(Some(LogOptions {
.set_log_options(Some(LogOptions {
action: LogAction::Forward,
policy: LogPolicy::Always,
source: LogSource::Both,
}))
.with_env(
.replace_env(
[
("COORDINATOR_KEY".to_string(), hex::encode((Ristretto::generator() * coord_key).to_bytes())),
(
@@ -50,8 +52,8 @@ pub fn instance(
("RUST_LOG".to_string(), "serai_message_queue=trace,".to_string()),
]
.into(),
);
composition.publish_all_ports();
)
.set_publish_all_ports(true);
(coord_key, priv_keys, composition)
}
@@ -64,9 +66,9 @@ fn basic_functionality() {
use serai_message_queue::{Service, Metadata, client::MessageQueue};
let mut test = DockerTest::new();
let mut test = DockerTest::new().with_network(dockertest::Network::Isolated);
let (coord_key, priv_keys, composition) = instance();
test.add_composition(composition);
test.provide_container(composition);
test.run(|ops| async move {
// Sleep for a second for the message-queue to boot
// It isn't an error to start immediately, it just silences an error