From 36b22103c30959517a9cf8d7b7fb1776a18aa0a4 Mon Sep 17 00:00:00 2001 From: Aleksandr Tretiakov Date: Tue, 25 Feb 2025 12:24:29 +0300 Subject: [PATCH 1/5] Fixed lint errors --- cmd/shield_repl/main.go | 6 +++--- precompiles/async/events.go | 5 ++++- precompiles/warden/events.go | 2 +- prophet/handlers/echo/echo.go | 2 +- prophet/handlers/pricepred/pricepred.go | 2 +- tests/framework/files/files.go | 8 ++++++-- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/cmd/shield_repl/main.go b/cmd/shield_repl/main.go index ab7b655a9..41d04e8f5 100644 --- a/cmd/shield_repl/main.go +++ b/cmd/shield_repl/main.go @@ -29,14 +29,14 @@ func main() { exp, err := shield.Parse(line) if err != nil { - io.WriteString(os.Stderr, err.Error()) + io.WriteString(os.Stderr, err.Error()) //nolint:all continue } evaluated := shield.Eval(exp, env) if evaluated != nil { - io.WriteString(os.Stdout, evaluated.Inspect()) - io.WriteString(os.Stdout, "\n") + io.WriteString(os.Stdout, evaluated.Inspect()) //nolint:all + io.WriteString(os.Stdout, "\n") //nolint:all } } } diff --git a/precompiles/async/events.go b/precompiles/async/events.go index 29133bbd1..ac6009a28 100644 --- a/precompiles/async/events.go +++ b/precompiles/async/events.go @@ -41,8 +41,11 @@ func (p *Precompile) GetCreateFutureEvent(ctx sdk.Context, writerAddress *ethcmn } topics[1], err = evmoscmn.MakeTopic(typedEvent.GetId()) - topics[2], err = evmoscmn.MakeTopic(creatorAddress) + if err != nil { + return nil, err + } + topics[2], err = evmoscmn.MakeTopic(creatorAddress) if err != nil { return nil, err } diff --git a/precompiles/warden/events.go b/precompiles/warden/events.go index e26ba00f0..1a64ce9af 100644 --- a/precompiles/warden/events.go +++ b/precompiles/warden/events.go @@ -417,7 +417,7 @@ func (p Precompile) GetUpdateKeychainEvent(ctx sdk.Context, _ *common.Address, e var marshaled []byte if err := precommon.ParseSdkEvent(eventUpdateKeychain, func(m proto.Message) { marshaled, err = proto.Marshal(m) - typedEvent.Unmarshal(marshaled) + typedEvent.Unmarshal(marshaled) //nolint:errcheck }); err != nil { return nil, err } diff --git a/prophet/handlers/echo/echo.go b/prophet/handlers/echo/echo.go index 129c681f0..869563f51 100644 --- a/prophet/handlers/echo/echo.go +++ b/prophet/handlers/echo/echo.go @@ -19,7 +19,7 @@ func (s Handler) Execute(ctx context.Context, input []byte) ([]byte, error) { } func (s Handler) Verify(ctx context.Context, input []byte, output []byte) error { - if bytes.Compare(input, output) != 0 { + if !bytes.Equal(input, output) { return fmt.Errorf("input and output do not match") } return nil diff --git a/prophet/handlers/pricepred/pricepred.go b/prophet/handlers/pricepred/pricepred.go index 1ccb7a1d3..9e457cf77 100644 --- a/prophet/handlers/pricepred/pricepred.go +++ b/prophet/handlers/pricepred/pricepred.go @@ -97,7 +97,7 @@ func (s PricePredictorSolidity) Execute(ctx context.Context, input []byte) ([]by var backtestingRes *BacktestingResponse if len(inputData.Metrics) > 0 { - res, err := s.c.Backtesting(ctx, BacktestingRequest{ + res, err := s.c.Backtesting(ctx, BacktestingRequest{ //nolint:all SolverInput: req.SolverInput, FalsePositiveRate: req.FalsePositiveRate, }) diff --git a/tests/framework/files/files.go b/tests/framework/files/files.go index eb601ae28..612532820 100644 --- a/tests/framework/files/files.go +++ b/tests/framework/files/files.go @@ -21,7 +21,9 @@ func CloneDir(dest, src string, templateData any) error { for _, entry := range entries { if entry.IsDir() { - CloneDir(dest+"/"+entry.Name(), src+"/"+entry.Name(), templateData) + if err := CloneDir(dest+"/"+entry.Name(), src+"/"+entry.Name(), templateData); err != nil { + return err + } } else { if strings.HasSuffix(entry.Name(), ".tmpl") { // render template @@ -35,7 +37,9 @@ func CloneDir(dest, src string, templateData any) error { return err } - t.Execute(out, templateData) + if err := t.Execute(out, templateData); err != nil { + return err + } } else { // copy file out, err := os.Create(dest + "/" + entry.Name()) From e11e8c2a2a54cf68c88fa523149eed1e46507633 Mon Sep 17 00:00:00 2001 From: Aleksandr Tretiakov Date: Tue, 25 Feb 2025 13:55:15 +0300 Subject: [PATCH 2/5] Fixed comments --- precompiles/common/events.go | 13 ++++++++++--- precompiles/warden/events.go | 4 ++-- tests/framework/exec/warden_node.go | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/precompiles/common/events.go b/precompiles/common/events.go index 625adefa8..b19b4ccea 100644 --- a/precompiles/common/events.go +++ b/precompiles/common/events.go @@ -8,6 +8,15 @@ import ( // Takes sdk.Event as proto msg, passes it to fillEvent. // fillEvent should create typed event for caller. func ParseSdkEvent(sdkEvent sdk.Event, fillEvent func(proto.Message)) error { + return ParseSdkEventSafe(sdkEvent, func(msg proto.Message) error { + fillEvent(msg) + return nil + }) +} + +// Takes sdk.Event as proto msg, passes it to fillEvent. +// fillEvent should create typed event for caller. +func ParseSdkEventSafe(sdkEvent sdk.Event, fillEvent func(proto.Message) error) error { events := sdk.EmptyEvents().AppendEvent(sdkEvent).ToABCIEvents() event := events[0] @@ -16,7 +25,5 @@ func ParseSdkEvent(sdkEvent sdk.Event, fillEvent func(proto.Message)) error { return err } - fillEvent(msg) - - return nil + return fillEvent(msg) } diff --git a/precompiles/warden/events.go b/precompiles/warden/events.go index 1a64ce9af..0fd010eb8 100644 --- a/precompiles/warden/events.go +++ b/precompiles/warden/events.go @@ -415,9 +415,9 @@ func (p Precompile) GetUpdateKeychainEvent(ctx sdk.Context, _ *common.Address, e // use Marshal/Unmarshal here cause big.Word=uint inside big.Int is not correctly merged in cosmos.gogoproto var err error var marshaled []byte - if err := precommon.ParseSdkEvent(eventUpdateKeychain, func(m proto.Message) { + if err := precommon.ParseSdkEventSafe(eventUpdateKeychain, func(m proto.Message) error { marshaled, err = proto.Marshal(m) - typedEvent.Unmarshal(marshaled) //nolint:errcheck + return typedEvent.Unmarshal(marshaled) }); err != nil { return nil, err } diff --git a/tests/framework/exec/warden_node.go b/tests/framework/exec/warden_node.go index 4e7468c71..157fdaad5 100644 --- a/tests/framework/exec/warden_node.go +++ b/tests/framework/exec/warden_node.go @@ -151,7 +151,7 @@ func (w *WardenNode) GRPCClient(t *testing.T) *GRPCClient { grpc.WithTransportCredentials(insecurecreds.NewCredentials()), } - grpcConn, err := grpc.Dial(w.grpcAddr(), opts...) + grpcConn, err := grpc.NewClient(w.grpcAddr(), opts...) require.NoError(t, err) return &GRPCClient{ From 15c779fae04e9b95f7c39c470530bd5f449a0568 Mon Sep 17 00:00:00 2001 From: Aleksandr Tretiakov Date: Tue, 25 Feb 2025 13:56:57 +0300 Subject: [PATCH 3/5] Comment fix --- prophet/handlers/pricepred/pricepred.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/prophet/handlers/pricepred/pricepred.go b/prophet/handlers/pricepred/pricepred.go index 9e457cf77..32dc00aa7 100644 --- a/prophet/handlers/pricepred/pricepred.go +++ b/prophet/handlers/pricepred/pricepred.go @@ -97,10 +97,7 @@ func (s PricePredictorSolidity) Execute(ctx context.Context, input []byte) ([]by var backtestingRes *BacktestingResponse if len(inputData.Metrics) > 0 { - res, err := s.c.Backtesting(ctx, BacktestingRequest{ //nolint:all - SolverInput: req.SolverInput, - FalsePositiveRate: req.FalsePositiveRate, - }) + res, err := s.c.Backtesting(ctx, BacktestingRequest(req)) if err != nil { return nil, err } From 5a26e50448bd263bd38b33b80b2f4e34c6906ca9 Mon Sep 17 00:00:00 2001 From: Aleksandr Tretiakov Date: Tue, 25 Feb 2025 16:52:19 +0300 Subject: [PATCH 4/5] Added more modules --- .github/workflows/wardend.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wardend.yaml b/.github/workflows/wardend.yaml index e23c839cc..5e1e8024c 100644 --- a/.github/workflows/wardend.yaml +++ b/.github/workflows/wardend.yaml @@ -17,7 +17,7 @@ on: - "precompiles/**" env: - modules: "./warden/... ./cmd/wardend/... ./cmd/faucet/..." + modules: "./warden/... ./cmd/wardend/... ./cmd/faucet/... ./prophet/... ./precompiles/..." jobs: lint: From a18e8b8e29c3e3f71cddeba6444597c07f3fd0f4 Mon Sep 17 00:00:00 2001 From: Aleksandr Tretiakov Date: Tue, 25 Feb 2025 16:52:49 +0300 Subject: [PATCH 5/5] Added more paths --- .github/workflows/wardend.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wardend.yaml b/.github/workflows/wardend.yaml index 5e1e8024c..be96feb19 100644 --- a/.github/workflows/wardend.yaml +++ b/.github/workflows/wardend.yaml @@ -8,6 +8,7 @@ on: - "cmd/wardend/**" - "warden/**" - "precompiles/**" + - "prophet/**" tags: - "wardend/v*" pull_request: @@ -15,6 +16,7 @@ on: - "cmd/wardend/**" - "warden/**" - "precompiles/**" + - "prophet/**" env: modules: "./warden/... ./cmd/wardend/... ./cmd/faucet/... ./prophet/... ./precompiles/..."