diff --git a/go.mod b/go.mod index 892231341d..f2848536ec 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,6 @@ require ( github.com/gofrs/flock v0.12.1 github.com/gogo/protobuf v1.3.3 github.com/golang/mock v1.6.0 - github.com/gorilla/mux v1.8.1 github.com/grafana/otel-profiling-go v0.5.1 github.com/grafana/pyroscope-go v1.1.2 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 @@ -185,6 +184,7 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/gorilla/handlers v1.5.2 // indirect + github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect diff --git a/nodebuilder/config.go b/nodebuilder/config.go index 52fb916fd1..d11672dfcd 100644 --- a/nodebuilder/config.go +++ b/nodebuilder/config.go @@ -26,29 +26,29 @@ type ConfigLoader func() (*Config, error) // Config is main configuration structure for a Node. // It combines configuration units for all Node subsystems. type Config struct { - Node node.Config - Core core.Config - State state.Config - P2P p2p.Config - RPC rpc.Config - Share share.Config - Header header.Config - DASer das.Config `toml:",omitempty"` - Pruner pruner.Config + Node node.Config + Core core.Config + State state.Config + P2P p2p.Config + RPC rpc.Config + Share share.Config + Header header.Config + DASer das.Config `toml:",omitempty"` + Pruner pruner.Config } // DefaultConfig provides a default Config for a given Node Type 'tp'. // NOTE: Currently, configs are identical, but this will change. func DefaultConfig(tp node.Type) *Config { commonConfig := &Config{ - Node: node.DefaultConfig(tp), - Core: core.DefaultConfig(), - State: state.DefaultConfig(), - P2P: p2p.DefaultConfig(tp), - RPC: rpc.DefaultConfig(), - Share: share.DefaultConfig(tp), - Header: header.DefaultConfig(tp), - Pruner: pruner.DefaultConfig(), + Node: node.DefaultConfig(tp), + Core: core.DefaultConfig(), + State: state.DefaultConfig(), + P2P: p2p.DefaultConfig(tp), + RPC: rpc.DefaultConfig(), + Share: share.DefaultConfig(tp), + Header: header.DefaultConfig(tp), + Pruner: pruner.DefaultConfig(), } switch tp { diff --git a/nodebuilder/tests/blob_test.go b/nodebuilder/tests/blob_test.go index 4b5ad52b24..8596d49527 100644 --- a/nodebuilder/tests/blob_test.go +++ b/nodebuilder/tests/blob_test.go @@ -111,7 +111,6 @@ func TestBlobModule(t *testing.T) { assert.Equal(t, v1[0].Commitment, blobV1.Commitment) assert.NotNil(t, blobV1.Signer()) assert.Equal(t, blobV1.Signer(), v1[0].Signer()) - }, }, {