From 3f7b1c23ee83b26288d85ebecdc92ca83c24aaf9 Mon Sep 17 00:00:00 2001 From: Jacinta Ferrant Date: Mon, 9 Oct 2023 12:23:44 -0700 Subject: [PATCH] Fix integration test dependencies Signed-off-by: Jacinta Ferrant --- Cargo.lock | 25 ++----------------------- testnet/stacks-node/Cargo.toml | 4 ++-- testnet/stacks-node/src/tests/signer.rs | 4 ++-- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ae3d0d97..6c6eabf41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3392,7 +3392,7 @@ dependencies = [ "tracing", "tracing-subscriber", "warp", - "wsts 4.0.0 (git+https://github.com/Trust-Machines/wsts?tag=4.0.0rc2)", + "wsts", ] [[package]] @@ -3420,7 +3420,7 @@ dependencies = [ "toml", "tracing", "tracing-subscriber", - "wsts 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wsts", ] [[package]] @@ -4518,27 +4518,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "wsts" -version = "4.0.0" -source = "git+https://github.com/Trust-Machines/wsts?tag=4.0.0rc2#e87f997781c0e9d9b2951d75059d673296311eec" -dependencies = [ - "aes-gcm 0.10.2", - "bs58 0.5.0", - "hashbrown 0.14.0", - "hex", - "num-traits", - "p256k1", - "polynomial", - "primitive-types", - "rand_core 0.6.4", - "serde", - "sha2 0.10.6", - "thiserror", - "tracing", - "tracing-subscriber", -] - [[package]] name = "wyz" version = "0.5.1" diff --git a/testnet/stacks-node/Cargo.toml b/testnet/stacks-node/Cargo.toml index 1eb350861..82ed994ee 100644 --- a/testnet/stacks-node/Cargo.toml +++ b/testnet/stacks-node/Cargo.toml @@ -38,10 +38,10 @@ clarity = { path = "../../clarity", features = ["default", "testing"]} stacks-common = { path = "../../stacks-common", features = ["default", "testing"] } stacks = { package = "stackslib", path = "../../stackslib", features = ["default", "testing"] } stacks-signer = { path = "../../stacks-signer" } -p256k1 = "5.4.1" +p256k1 = "5.5" tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -wsts = { git = "https://github.com/Trust-Machines/wsts", tag = "4.0.0rc2" } +wsts = "4.0.0" [dev-dependencies.rusqlite] version = "=0.24.2" diff --git a/testnet/stacks-node/src/tests/signer.rs b/testnet/stacks-node/src/tests/signer.rs index c99cbe012..e1c4af5ab 100644 --- a/testnet/stacks-node/src/tests/signer.rs +++ b/testnet/stacks-node/src/tests/signer.rs @@ -26,7 +26,7 @@ use stacks_signer::{ }; use tracing_subscriber::{fmt, prelude::*, EnvFilter}; use wsts::{ - state_machine::{coordinator::Coordinator as FrostCoordinator, OperationResult}, + state_machine::{coordinator::frost::Coordinator as FrostCoordinator, OperationResult}, v2, }; @@ -171,7 +171,7 @@ fn test_stackerdb_dkg() { .collect::>(); let signer_stacks_addresses = signer_stacks_private_keys .iter() - .map(|key| to_addr(key).into()) + .map(to_addr) .collect::>(); // Setup the neon node