relayer/pkg/chainlink/cmd/chainlink-starknet: un-nest config (#591)

jmank88 · web-flow · commit 3611be4376a9 · 2025-02-03T11:09:00.000-06:00
diff --git a/relayer/pkg/chainlink/cmd/chainlink-starknet/main.go b/relayer/pkg/chainlink/cmd/chainlink-starknet/main.go
@@ -59,9 +59,8 @@ type pluginRelayer struct {
 func (c *pluginRelayer) NewRelayer(ctx context.Context, config string, loopKs loop.Keystore, capRegistry core.CapabilitiesRegistry) (loop.Relayer, error) {
 	d := toml.NewDecoder(strings.NewReader(config))
 	d.DisallowUnknownFields()
-	var cfg struct {
-		Starknet stkcfg.TOMLConfig
-	}
+
+	var cfg stkcfg.TOMLConfig
 	if err := d.Decode(&cfg); err != nil {
 		return nil, fmt.Errorf("failed to decode config toml: %w:\n\t%s", err, config)
 	}
@@ -71,7 +70,7 @@ func (c *pluginRelayer) NewRelayer(ctx context.Context, config string, loopKs lo
 		KeyStore: loopKs,
 	}
 
-	chain, err := starkchain.NewChain(&cfg.Starknet, opts)
+	chain, err := starkchain.NewChain(&cfg, opts)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create chain: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,8 @@ type pluginRelayer struct {`
`59`	`59`	`func (c *pluginRelayer) NewRelayer(ctx context.Context, config string, loopKs loop.Keystore, capRegistry core.CapabilitiesRegistry) (loop.Relayer, error) {`
`60`	`60`	`d := toml.NewDecoder(strings.NewReader(config))`
`61`	`61`	`d.DisallowUnknownFields()`
`62`		`- var cfg struct {`
`63`		`- Starknet stkcfg.TOMLConfig`
`64`		`- }`
	`62`	`+`
	`63`	`+ var cfg stkcfg.TOMLConfig`
`65`	`64`	`if err := d.Decode(&cfg); err != nil {`
`66`	`65`	`return nil, fmt.Errorf("failed to decode config toml: %w:\n\t%s", err, config)`
`67`	`66`	`}`
`@@ -71,7 +70,7 @@ func (c *pluginRelayer) NewRelayer(ctx context.Context, config string, loopKs lo`
`71`	`70`	`KeyStore: loopKs,`
`72`	`71`	`}`
`73`	`72`
`74`		`- chain, err := starkchain.NewChain(&cfg.Starknet, opts)`
	`73`	`+ chain, err := starkchain.NewChain(&cfg, opts)`
`75`	`74`	`if err != nil {`
`76`	`75`	`return nil, fmt.Errorf("failed to create chain: %w", err)`
`77`	`76`	`}`