diff --git a/Cargo.lock b/Cargo.lock index 177f035c810c..03d00cde34ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8293,6 +8293,15 @@ dependencies = [ "yap", ] +[[package]] +name = "scc" +version = "2.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8d25269dd3a12467afe2e510f69fb0b46b698e5afb296b59f2145259deaf8e8" +dependencies = [ + "sdd", +] + [[package]] name = "schannel" version = "0.1.26" @@ -8337,6 +8346,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sdd" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95" + [[package]] name = "seahash" version = "4.1.0" @@ -8730,6 +8745,31 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "serial_test" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +dependencies = [ + "futures 0.3.31", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +dependencies = [ + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", +] + [[package]] name = "sha-1" version = "0.9.8" @@ -12151,6 +12191,7 @@ dependencies = [ "secp256k1", "serde", "serde_json", + "serial_test", "sha2 0.10.8", "sha3 0.10.8", "subxt-metadata", diff --git a/core/lib/config/src/configs/da_client/eigen.rs b/core/lib/config/src/configs/da_client/eigen.rs index 4452e34e5f56..103845afa405 100644 --- a/core/lib/config/src/configs/da_client/eigen.rs +++ b/core/lib/config/src/configs/da_client/eigen.rs @@ -23,7 +23,6 @@ pub struct MemStoreConfig { #[derive(Clone, Debug, PartialEq, Deserialize, Default)] pub struct DisperserConfig { - pub custom_quorum_numbers: Option>, pub disperser_rpc: String, pub eth_confirmation_depth: i32, pub eigenda_eth_rpc: String, diff --git a/core/lib/env_config/src/da_client.rs b/core/lib/env_config/src/da_client.rs index f526e27e57a0..7dc5ece5db59 100644 --- a/core/lib/env_config/src/da_client.rs +++ b/core/lib/env_config/src/da_client.rs @@ -307,7 +307,6 @@ mod tests { assert_eq!( actual, DAClientConfig::Eigen(EigenConfig::Disperser(DisperserConfig { - custom_quorum_numbers: None, disperser_rpc: "http://localhost:8080".to_string(), eth_confirmation_depth: 0, eigenda_eth_rpc: "http://localhost:8545".to_string(), diff --git a/core/lib/protobuf_config/src/da_client.rs b/core/lib/protobuf_config/src/da_client.rs index d7395d7f22df..f1fbf26d89f0 100644 --- a/core/lib/protobuf_config/src/da_client.rs +++ b/core/lib/protobuf_config/src/da_client.rs @@ -73,7 +73,6 @@ impl ProtoRepr for proto::DataAvailabilityClient { } proto::eigen_config::Config::Disperser(conf) => { EigenConfig::Disperser(DisperserConfig { - custom_quorum_numbers: Some(conf.custom_quorum_numbers.clone()), disperser_rpc: required(&conf.disperser_rpc) .context("disperser_rpc")? .clone(), @@ -167,10 +166,6 @@ impl ProtoRepr for proto::DataAvailabilityClient { proto::data_availability_client::Config::Eigen(proto::EigenConfig { config: Some(proto::eigen_config::Config::Disperser( proto::DisperserConfig { - custom_quorum_numbers: config - .custom_quorum_numbers - .clone() - .unwrap_or_default(), disperser_rpc: Some(config.disperser_rpc.clone()), eth_confirmation_depth: Some(config.eth_confirmation_depth), eigenda_eth_rpc: Some(config.eigenda_eth_rpc.clone()), diff --git a/core/lib/protobuf_config/src/proto/config/da_client.proto b/core/lib/protobuf_config/src/proto/config/da_client.proto index 1875cd0ea194..a143d043ebe5 100644 --- a/core/lib/protobuf_config/src/proto/config/da_client.proto +++ b/core/lib/protobuf_config/src/proto/config/da_client.proto @@ -44,7 +44,6 @@ message MemStoreConfig { } message DisperserConfig { - repeated uint32 custom_quorum_numbers = 1; optional string disperser_rpc = 3; optional int32 eth_confirmation_depth = 4; optional string eigenda_eth_rpc = 5; diff --git a/core/node/da_clients/Cargo.toml b/core/node/da_clients/Cargo.toml index d468221303ef..7283277d148a 100644 --- a/core/node/da_clients/Cargo.toml +++ b/core/node/da_clients/Cargo.toml @@ -65,3 +65,4 @@ ethabi = "16.0.0" rust-kzg-bn254 = {git = "https://github.com/lambdaclass/rust-kzg-bn254", branch = "bump-ark"} ark-bn254 = "0.5.0-alpha.0" num-bigint = "0.4.6" +serial_test = "3.1.1" diff --git a/core/node/da_clients/src/eigen/client.rs b/core/node/da_clients/src/eigen/client.rs index 5048bf7d780b..549c7526b621 100644 --- a/core/node/da_clients/src/eigen/client.rs +++ b/core/node/da_clients/src/eigen/client.rs @@ -110,11 +110,12 @@ mod tests { use super::*; use crate::eigen::blob_info::BlobInfo; + use serial_test::serial; #[tokio::test] + #[serial] async fn test_non_auth_dispersal() { let config = EigenConfig::Disperser(DisperserConfig { - custom_quorum_numbers: None, disperser_rpc: "https://disperser-holesky.eigenda.xyz:443".to_string(), eth_confirmation_depth: -1, eigenda_eth_rpc: "https://ethereum-holesky-rpc.publicnode.com".to_string(), @@ -151,9 +152,9 @@ mod tests { } #[tokio::test] + #[serial] async fn test_auth_dispersal() { let config = EigenConfig::Disperser(DisperserConfig { - custom_quorum_numbers: None, disperser_rpc: "https://disperser-holesky.eigenda.xyz:443".to_string(), eth_confirmation_depth: -1, eigenda_eth_rpc: "https://ethereum-holesky-rpc.publicnode.com".to_string(), @@ -222,9 +223,9 @@ mod tests { assert_eq!(retrieved_data.unwrap(), data); } #[tokio::test] + #[serial] async fn test_wait_for_finalization() { let config = EigenConfig::Disperser(DisperserConfig { - custom_quorum_numbers: None, disperser_rpc: "https://disperser-holesky.eigenda.xyz:443".to_string(), blob_size_limit: 2 * 1024 * 1024, // 2MB status_query_timeout: 1800000, // 30 minutes @@ -287,9 +288,9 @@ mod tests { } #[tokio::test] + #[serial] async fn test_eth_confirmation_depth() { let config = EigenConfig::Disperser(DisperserConfig { - custom_quorum_numbers: None, disperser_rpc: "https://disperser-holesky.eigenda.xyz:443".to_string(), eth_confirmation_depth: 5, eigenda_eth_rpc: "https://ethereum-holesky-rpc.publicnode.com".to_string(), @@ -326,9 +327,9 @@ mod tests { } #[tokio::test] + #[serial] async fn test_auth_dispersal_eth_confirmation_depth() { let config = EigenConfig::Disperser(DisperserConfig { - custom_quorum_numbers: None, disperser_rpc: "https://disperser-holesky.eigenda.xyz:443".to_string(), eth_confirmation_depth: 5, eigenda_eth_rpc: "https://ethereum-holesky-rpc.publicnode.com".to_string(),