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

Remove blutgang/nginx from e2e tests and just randomize clients #2371

Open
wants to merge 1 commit into
base: replace-blutgang-with-spamoor-replicas
Choose a base branch
from
Open

Remove blutgang/nginx from e2e tests and just randomize clients #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions kurtosis/main.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ beacond = import_module("./src/nodes/consensus/beacond/launcher.star")
networks = import_module("./src/networks/networks.star")
port_spec_lib = import_module("./src/lib/port_spec.star")
nodes = import_module("./src/nodes/nodes.star")
nginx = import_module("./src/services/nginx/nginx.star")
constants = import_module("./src/constants.star")
spamoor = import_module("./src/services/spamoor/launcher.star")
prometheus = import_module("./src/observability/prometheus/prometheus.star")
grafana = import_module("./src/observability/grafana/grafana.star")
pyroscope = import_module("./src/observability/pyroscope/pyroscope.star")
tx_fuzz = import_module("./src/services/tx_fuzz/launcher.star")
blutgang = import_module("./src/services/blutgang/launcher.star")
blockscout = import_module("./src/services/blockscout/launcher.star")
otterscan = import_module("./src/services/otterscan/launcher.star")

Expand Down
1 change: 0 additions & 1 deletion kurtosis/src/constants.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ GLOBAL_LOG_LEVEL = struct(
JWT_MOUNT_PATH_ON_CONTAINER = "/jwt/jwt-secret.hex"
JWT_FILEPATH = "/kurtosis/src/nodes/jwt-secret.hex"
KZG_TRUSTED_SETUP_FILEPATH = "/kurtosis/src/nodes/kzg-trusted-setup.json"
BLUTGANG_CONFIG_TEMPLATE_FILEPATH = "/kurtosis/src/services/blutgang/config.toml.tmpl"

def new_prefunded_account(address, private_key):
return struct(address = address, private_key = private_key)
Expand Down
74 changes: 0 additions & 74 deletions kurtosis/src/services/blutgang/config.toml.tmpl
View file
Open in desktop

This file was deleted.

125 changes: 0 additions & 125 deletions kurtosis/src/services/blutgang/launcher.star
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions kurtosis/src/services/nginx/default.conf.template
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions kurtosis/src/services/nginx/nginx.star
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions testing/e2e/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ type E2ETestConfig struct {
NetworkConfiguration NetworkConfiguration `json:"network_configuration"`
// NodeSettings specifies the configuration for the nodes in the test.
NodeSettings NodeSettings `json:"node_settings"`
// EthJSONRPCEndpoints specifies the RPC endpoints to include in the test.
EthJSONRPCEndpoints []EthJSONRPCEndpoint `json:"eth_json_rpc_endpoints"`
// AdditionalServices specifies any extra services that should be included
// in the test environment.
AdditionalServices []AdditionalService `json:"additional_services"`
Expand Down
26 changes: 4 additions & 22 deletions testing/e2e/config/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ func DefaultE2ETestConfig() *E2ETestConfig {
return &E2ETestConfig{
NetworkConfiguration: defaultNetworkConfiguration(),
NodeSettings: defaultNodeSettings(),
EthJSONRPCEndpoints: defaultEthJSONRPCEndpoints(),
AdditionalServices: defaultAdditionalServices(),
}
}
Expand Down Expand Up @@ -96,17 +95,17 @@ func defaultFullNodes() NodeSet {
Nodes: []Node{
{
ElType: "nethermind",
Replicas: 1,
Replicas: 0,
KZGImpl: "crate-crypto/go-kzg-4844",
},
{
ElType: "reth",
Replicas: 1,
Replicas: 2, //nolint:mnd // we want two replicas here
KZGImpl: "crate-crypto/go-kzg-4844",
},
{
ElType: "geth",
Replicas: 1,
Replicas: 2, //nolint:mnd // we want two replicas here
KZGImpl: "crate-crypto/go-kzg-4844",
},
{
Expand All @@ -116,7 +115,7 @@ func defaultFullNodes() NodeSet {
},
{
ElType: "besu",
Replicas: 1,
Replicas: 0,
KZGImpl: "crate-crypto/go-kzg-4844",
},
},
Expand Down Expand Up @@ -196,23 +195,6 @@ func defaultConsensusSettings() ConsensusSettings {
}
}

func defaultEthJSONRPCEndpoints() []EthJSONRPCEndpoint {
return []EthJSONRPCEndpoint{
{
Type: "blutgang",
Clients: []string{
// "el-full-nethermind-0",
// "el-full-reth-0",
"el-full-geth-2",
// "el-full-erigon-3",
// "el-full-erigon-3",
// Besu causing flakey tests.
// "el-full-besu-4",
},
},
}
}

func defaultAdditionalServices() []AdditionalService {
return []AdditionalService{}
}
Loading
Loading