Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(eigen-client-extra-features): Remove unused custom quorum numbers #329

Merged
merged 3 commits into from
Nov 7, 2024
Merged

feat(eigen-client-extra-features): Remove unused custom quorum numbers #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f369ab9
Remove unused custom quorum numbers
gianbelinche Nov 6, 2024
7b8d4f5
Merge branch 'eigen-client-extra-features' into eigen-client-remove-q…
gianbelinche Nov 7, 2024
7b514e7
Add serial to tests
gianbelinche Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion core/lib/config/src/configs/da_client/eigen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ pub struct MemStoreConfig {

#[derive(Clone, Debug, PartialEq, Deserialize, Default)]
pub struct DisperserConfig {
pub custom_quorum_numbers: Option<Vec<u32>>,
pub disperser_rpc: String,
pub eth_confirmation_depth: i32,
pub eigenda_eth_rpc: String,
Expand Down
1 change: 0 additions & 1 deletion core/lib/env_config/src/da_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
5 changes: 0 additions & 5 deletions core/lib/protobuf_config/src/da_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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()),
Expand Down
1 change: 0 additions & 1 deletion core/lib/protobuf_config/src/proto/config/da_client.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions core/node/da_clients/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
11 changes: 6 additions & 5 deletions core/node/da_clients/src/eigen/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down
Loading