Skip to content

Commit d5c87f5

Browse files
fix: remove ger validate config validation
1 parent 31027c0 commit d5c87f5

File tree

2 files changed

+0
-59
lines changed

2 files changed

+0
-59
lines changed

aggsender/validator/config.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,6 @@ type GERValidateConfig struct {
8888
BlockFinality aggkittypes.BlockNumberFinality `jsonschema:"enum=LatestBlock, enum=SafeBlock, enum=PendingBlock, enum=FinalizedBlock, enum=EarliestBlock" mapstructure:"BlockFinality"` //nolint:lll
8989
}
9090

91-
// Validate checks if the GERValidateConfig is valid
92-
func (g GERValidateConfig) Validate() error {
93-
if err := g.BlockFinality.Validate(); err != nil {
94-
return fmt.Errorf("invalid BlockFinality configuration: %w", err)
95-
}
96-
97-
if g.GlobalExitRootL1Addr == aggkitcommon.ZeroAddress {
98-
return fmt.Errorf("GlobalExitRootL1Addr must be set")
99-
}
100-
101-
return nil
102-
}
103-
10491
// Validate checks if the configuration is valid
10592
func (c *Config) Validate() error {
10693
err := c.Mode.Validate()
@@ -118,9 +105,5 @@ func (c *Config) Validate() error {
118105
return fmt.Errorf("invalid agglayer client config: %w", err)
119106
}
120107

121-
if err := c.GERValidateConfig.Validate(); err != nil {
122-
return fmt.Errorf("invalid GER validation config: %w", err)
123-
}
124-
125108
return nil
126109
}

aggsender/validator/config_test.go

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
aggsendertypes "github.com/agglayer/aggkit/aggsender/types"
99
"github.com/agglayer/aggkit/config/types"
1010
"github.com/agglayer/aggkit/grpc"
11-
aggkittypes "github.com/agglayer/aggkit/types"
1211
"github.com/ethereum/go-ethereum/common"
1312
"github.com/stretchr/testify/require"
1413
)
@@ -25,10 +24,6 @@ func TestValidatorConfigValidate(t *testing.T) {
2524
name: "Valid PessimisticProof mode",
2625
config: Config{
2726
Mode: aggsendertypes.PessimisticProofMode,
28-
GERValidateConfig: GERValidateConfig{
29-
GlobalExitRootL1Addr: common.HexToAddress("0x2"),
30-
BlockFinality: aggkittypes.FinalizedBlock,
31-
},
3227
AgglayerClient: agglayer.ClientConfig{GRPC: &grpc.ClientConfig{
3328
URL: "http://localhost:9090",
3429
MinConnectTimeout: types.NewDuration(5 * time.Second),
@@ -42,48 +37,11 @@ func TestValidatorConfigValidate(t *testing.T) {
4237
FEPConfig: FEPConfig{
4338
SovereignRollupAddr: common.HexToAddress("0x1"),
4439
},
45-
GERValidateConfig: GERValidateConfig{
46-
GlobalExitRootL1Addr: common.HexToAddress("0x2"),
47-
BlockFinality: aggkittypes.FinalizedBlock,
48-
},
49-
AgglayerClient: agglayer.ClientConfig{GRPC: &grpc.ClientConfig{
50-
URL: "http://localhost:9090",
51-
MinConnectTimeout: types.NewDuration(5 * time.Second),
52-
}},
53-
},
54-
},
55-
{
56-
name: "Invalid GERValidateConfig - zero address",
57-
config: Config{
58-
Mode: aggsendertypes.PessimisticProofMode,
59-
GERValidateConfig: GERValidateConfig{
60-
GlobalExitRootL1Addr: common.HexToAddress("0x0"), // Zero address
61-
BlockFinality: aggkittypes.FinalizedBlock,
62-
},
63-
AgglayerClient: agglayer.ClientConfig{GRPC: &grpc.ClientConfig{
64-
URL: "http://localhost:9090",
65-
MinConnectTimeout: types.NewDuration(5 * time.Second),
66-
}},
67-
},
68-
expectedErr: "GlobalExitRootL1Addr must be set",
69-
},
70-
{
71-
name: "Invalid GERValidateConfig - block finality non valid",
72-
config: Config{
73-
Mode: aggsendertypes.PessimisticProofMode,
74-
GERValidateConfig: GERValidateConfig{
75-
GlobalExitRootL1Addr: common.HexToAddress("0x2"),
76-
BlockFinality: aggkittypes.BlockNumberFinality{
77-
Block: aggkittypes.Finalized,
78-
Offset: aggkittypes.MaxPositiveOffsetFinalized + 1, // Invalid offset
79-
},
80-
},
8140
AgglayerClient: agglayer.ClientConfig{GRPC: &grpc.ClientConfig{
8241
URL: "http://localhost:9090",
8342
MinConnectTimeout: types.NewDuration(5 * time.Second),
8443
}},
8544
},
86-
expectedErr: "invalid BlockFinality configuration",
8745
},
8846
{
8947
name: "Invalid AggchainProof mode",

0 commit comments

Comments
 (0)