Skip to content

Commit

Permalink
DEBUG: Check parrot image type
Browse files Browse the repository at this point in the history
  • Loading branch information
kalverra committed Feb 26, 2025
2 parents 982c0a6 + d27cae5 commit 8f1eae7
Show file tree
Hide file tree
Showing 17 changed files with 149 additions and 101 deletions.
5 changes: 5 additions & 0 deletions .changeset/swift-nails-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

go.mod update in core/scripts #updated
10 changes: 10 additions & 0 deletions .github/actions/goreleaser-build-sign-publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ inputs:
runs:
using: composite
steps:
# See https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
- name: Delete unused tools to free up space
shell: bash
run: |
sudo rm -rf /opt/hostedtoolcache/CodeQL
sudo rm -rf /opt/hostedtoolcache/PyPy
sudo rm -rf /opt/hostedtoolcache/Python
sudo rm -rf /opt/hostedtoolcache/Ruby
sudo rm -rf /opt/hostedtoolcache/Java_*
- # We need QEMU to test the cross architecture builds after they're built.
name: Set up QEMU
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-publish-develop-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
with:
persist-credentials: false
ref: ${{ env.CHECKOUT_REF }}
fetch-depth: 0
fetch-depth: 1

- name: Setup Github Token
id: token
Expand Down
4 changes: 1 addition & 3 deletions core/scripts/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/smartcontractkit/chainlink/core/scripts

go 1.24

toolchain go1.24.0
go 1.24.0

// Make sure we're working with the latest chainlink libs
replace github.com/smartcontractkit/chainlink/v2 => ../../
Expand Down
4 changes: 1 addition & 3 deletions deployment/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/smartcontractkit/chainlink/deployment

go 1.24

toolchain go1.24.0
go 1.24.0

// Make sure we're working with the latest chainlink libs
replace github.com/smartcontractkit/chainlink/v2 => ../
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/smartcontractkit/chainlink/v2

go 1.24

toolchain go1.24.0
go 1.24.0

require (
github.com/Depado/ginprom v1.8.0
Expand Down
10 changes: 5 additions & 5 deletions integration-tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ require (
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250213145514-41d874782c02
github.com/smartcontractkit/chainlink-protos/job-distributor v0.9.0
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226204105-e29bfa4a952f
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.5.0
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.0
github.com/smartcontractkit/chainlink-testing-framework/sentinel v0.1.2
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.10.0
Expand Down
28 changes: 12 additions & 16 deletions integration-tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1462,26 +1462,22 @@ github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a/go.mod h1:aFm1QC/n99mVeBDtv0SE0co56+IECY6Y1fR3OfNYy3c=
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e h1:6poVaumg1KZYW/K8Aeip2VN2k9TnSjK6ujwfxJnIsoY=
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e/go.mod h1:tnyujVNgajqe67i2/0iwS4Y3mvbA30XBQWLEAArpwfw=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e h1:2LFrQLx5VoilcbmiDC9+0rENoNLNECEVYYj3c/VDpHs=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e/go.mod h1:SKBYQvtnl3OqOTr5aQyt9YbIckuNNn40LOJUCR0vlMo=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225221648-901d01c3f34d h1:LrV3j0hElsS9j4eF7nYHr4cEd4/Um7GPCSbHXRX/Gj8=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225221648-901d01c3f34d/go.mod h1:+ZDD9sEUxztv16mQGXfOPFouu/kBVKvSSJ66NzrbK/I=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226195219-a6a67078c91a h1:qrQQcFvdzPELi70Q5Pxtn3kmfEHEbqSeG8asfhGVN5E=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226195219-a6a67078c91a/go.mod h1:+ZDD9sEUxztv16mQGXfOPFouu/kBVKvSSJ66NzrbK/I=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226201452-24bb9ee4c56c h1:cSCjPpZSBvdeWHDnRsI4Kr1Y9vwxR1/bf1y2aa2Kkss=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226201452-24bb9ee4c56c/go.mod h1:+ZDD9sEUxztv16mQGXfOPFouu/kBVKvSSJ66NzrbK/I=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 h1:S5HND0EDtlA+xp2E+mD11DlUTp2wD6uojwixye8ZB/k=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5/go.mod h1:SKBYQvtnl3OqOTr5aQyt9YbIckuNNn40LOJUCR0vlMo=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0 h1:rNjLZrwY3TcrANHVz/JUm55vufzoeRogSlgjAH7plvU=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0/go.mod h1:jNxIJa9Fl/zM7rFahUFE8E55VGPC/2e6ilqVKoSbr8U=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226204105-e29bfa4a952f h1:iu6VsWZZ/2FOBdaEYR/slYvXb9VgOeomUopgL+yYsBw=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226204105-e29bfa4a952f/go.mod h1:+ZDD9sEUxztv16mQGXfOPFouu/kBVKvSSJ66NzrbK/I=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e h1:g1fOH4P+JLU70bpjQVL7viDU7EhB+JKr1SpvpIDce+g=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e/go.mod h1:ym1yBKknQkGfgSQF7EGXSevDuex1YZbz+zgDwRvhY3U=
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.5.0 h1:7jTtihiDAM7s/mDsOLx8Rdhn/cjm40ev7sTvRGBo/KY=
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.5.0/go.mod h1:LbO9Wh8t0J4FtePnXse3sWPeuxa1xBdBQsD4h1WButw=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0 h1:+6L/PVxWsaYCr9jmxtKfyCcEJm1o6UaKrFJU9jAiZwA=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0/go.mod h1:ym1yBKknQkGfgSQF7EGXSevDuex1YZbz+zgDwRvhY3U=
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.0 h1:hMZWkNIBB32Nm4WOQe6SjnhSIb8pw4V3+UemNXE8UeA=
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.0/go.mod h1:LbO9Wh8t0J4FtePnXse3sWPeuxa1xBdBQsD4h1WButw=
github.com/smartcontractkit/chainlink-testing-framework/sentinel v0.1.2 h1:ihRlWrii5nr4RUuMu1hStTbwFvVuHUDoQQwXmCU5IdQ=
github.com/smartcontractkit/chainlink-testing-framework/sentinel v0.1.2/go.mod h1:J1Za5EuI/vWDsQSIh6qbPXlVvuEhmHmnvLQBN0XVxqA=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10 h1:Yf+n3T/fnUWcYyfe7bsygV4sWAkNo0QhN58APJFIKIc=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10/go.mod h1:05duR85P8YHuIfIkA7sn2bvrhKo/pDpFKV2rliYHNOo=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e h1:Xuulg3EfQdsgO4j+IaMkffpmd0UbIcppB4wsIafKPsA=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e/go.mod h1:eqV2n0vpqnY5N51je5/1vC/Qm8MMXVKvOXjLM+53Sog=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0 h1:cH+/lRpm7VN1a/tX7HmJCtQfZjLRyw1khG7CEQS94jA=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0 h1:qaLw7J7oRRsj+lUzzIjGVlXAVNmkAEwjj7xTXe0hcAk=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0/go.mod h1:eqV2n0vpqnY5N51je5/1vC/Qm8MMXVKvOXjLM+53Sog=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 h1:PKiqnVOTChlH4a4ljJKL3OKGRgYfIpJS4YD1daAIKks=
Expand Down
12 changes: 6 additions & 6 deletions integration-tests/load/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ require (
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250226083129-e596590f48f7
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250213145514-41d874782c02
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225214927-63ae47b2d794
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.14-0.20250225174253-0fe1e95e89b2
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226204105-e29bfa4a952f
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0
github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20241009055228-33d0c0bf38de
github.com/stretchr/testify v1.10.0
github.com/wiremock/go-wiremock v1.9.0
Expand Down Expand Up @@ -442,9 +442,9 @@ require (
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 // indirect
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a // indirect
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e // indirect
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e // indirect
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e // indirect
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.5.0 // indirect
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 // indirect
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0 // indirect
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.0 // indirect
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 // indirect
github.com/smartcontractkit/mcms v0.12.2 // indirect
Expand Down
26 changes: 14 additions & 12 deletions integration-tests/load/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1447,18 +1447,20 @@ github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a/go.mod h1:aFm1QC/n99mVeBDtv0SE0co56+IECY6Y1fR3OfNYy3c=
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e h1:6poVaumg1KZYW/K8Aeip2VN2k9TnSjK6ujwfxJnIsoY=
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e/go.mod h1:tnyujVNgajqe67i2/0iwS4Y3mvbA30XBQWLEAArpwfw=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e h1:2LFrQLx5VoilcbmiDC9+0rENoNLNECEVYYj3c/VDpHs=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e/go.mod h1:SKBYQvtnl3OqOTr5aQyt9YbIckuNNn40LOJUCR0vlMo=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225214927-63ae47b2d794 h1:cSRfN+MQGQ4M7KWJYacSM50ry7Z44hktVp+rbie4gjU=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225214927-63ae47b2d794/go.mod h1:+ZDD9sEUxztv16mQGXfOPFouu/kBVKvSSJ66NzrbK/I=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e h1:g1fOH4P+JLU70bpjQVL7viDU7EhB+JKr1SpvpIDce+g=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e/go.mod h1:ym1yBKknQkGfgSQF7EGXSevDuex1YZbz+zgDwRvhY3U=
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.5.0 h1:7jTtihiDAM7s/mDsOLx8Rdhn/cjm40ev7sTvRGBo/KY=
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.5.0/go.mod h1:LbO9Wh8t0J4FtePnXse3sWPeuxa1xBdBQsD4h1WButw=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.14-0.20250225174253-0fe1e95e89b2 h1:DFP15nHtZntUnhAsHFxeE40jgHf5qgBX9TvzX49yRdU=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.14-0.20250225174253-0fe1e95e89b2/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e h1:Xuulg3EfQdsgO4j+IaMkffpmd0UbIcppB4wsIafKPsA=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e/go.mod h1:eqV2n0vpqnY5N51je5/1vC/Qm8MMXVKvOXjLM+53Sog=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 h1:S5HND0EDtlA+xp2E+mD11DlUTp2wD6uojwixye8ZB/k=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5/go.mod h1:SKBYQvtnl3OqOTr5aQyt9YbIckuNNn40LOJUCR0vlMo=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0 h1:rNjLZrwY3TcrANHVz/JUm55vufzoeRogSlgjAH7plvU=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0/go.mod h1:jNxIJa9Fl/zM7rFahUFE8E55VGPC/2e6ilqVKoSbr8U=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226204105-e29bfa4a952f h1:iu6VsWZZ/2FOBdaEYR/slYvXb9VgOeomUopgL+yYsBw=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.1-0.20250226204105-e29bfa4a952f/go.mod h1:+ZDD9sEUxztv16mQGXfOPFouu/kBVKvSSJ66NzrbK/I=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0 h1:+6L/PVxWsaYCr9jmxtKfyCcEJm1o6UaKrFJU9jAiZwA=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0/go.mod h1:ym1yBKknQkGfgSQF7EGXSevDuex1YZbz+zgDwRvhY3U=
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.0 h1:hMZWkNIBB32Nm4WOQe6SjnhSIb8pw4V3+UemNXE8UeA=
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.0/go.mod h1:LbO9Wh8t0J4FtePnXse3sWPeuxa1xBdBQsD4h1WButw=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0 h1:cH+/lRpm7VN1a/tX7HmJCtQfZjLRyw1khG7CEQS94jA=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0 h1:qaLw7J7oRRsj+lUzzIjGVlXAVNmkAEwjj7xTXe0hcAk=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0/go.mod h1:eqV2n0vpqnY5N51je5/1vC/Qm8MMXVKvOXjLM+53Sog=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 h1:PKiqnVOTChlH4a4ljJKL3OKGRgYfIpJS4YD1daAIKks=
Expand Down
11 changes: 8 additions & 3 deletions integration-tests/testsetups/automation_benchmark.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/pkg/errors"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
Expand Down Expand Up @@ -230,10 +231,14 @@ func (k *KeeperBenchmarkTest) Run() {
var startedObservations = atomic.Int32{}
var finishedObservations = atomic.Int32{}

// since Seth can also be using simulated.Backend we need to make sure we are using ethclient.Client
sethAsEthClient, ok := k.chainClient.Client.(*ethclient.Client)
require.True(k.t, ok, "chainClient (Seth) client should be an ethclient.Client")

// We create as many channels as listening goroutines (1 per upkeep). In the background we will be fanning out
// headers that we get from a single channel connected to EVM node to all upkeep-specific channels.
headerCh := make(chan *blockchain.SafeEVMHeader, 10)
sub, err := k.chainClient.Client.Client().EthSubscribe(context.Background(), headerCh, "newHeads")
sub, err := sethAsEthClient.Client().EthSubscribe(context.Background(), headerCh, "newHeads")
require.NoError(k.t, err, "Subscribing to new headers for upkeep observation shouldn't fail")

totalNumberOfChannels := 0
Expand Down Expand Up @@ -279,7 +284,7 @@ func (k *KeeperBenchmarkTest) Run() {
// we use infinite loop here on purposes, these nodes can be down for extended periods of time ¯\_(ツ)_/¯
RECONNECT:
for {
sub, err = k.chainClient.Client.Client().EthSubscribe(context.Background(), headerCh, "newHeads")
sub, err = sethAsEthClient.Client().EthSubscribe(context.Background(), headerCh, "newHeads")
if err == nil {
break RECONNECT
}
Expand Down Expand Up @@ -326,7 +331,7 @@ func (k *KeeperBenchmarkTest) Run() {
case <-stopAllGoroutinesCh: // header listening failed, exit
return errors.New("header distribution channel closed")
case <-errCtx.Done(): //one of goroutines errored, shut down gracefully, no need to return error
k.log.Error().Err(errCtx.Err()).Str("UpkeepID", upkeepIDCopy.String()).Msg("Stopping obervations due to error in one of the goroutines")
k.log.Error().Err(errCtx.Err()).Str("UpkeepID", upkeepIDCopy.String()).Msg("Stopping observations due to error in one of the goroutines")
return nil
case header := <-contractChannels[chIndex]: // new block, check if upkeep was performed
k.log.Trace().Interface("Header number", header.Number).Str("UpkeepID", upkeepIDCopy.String()).Msg("Started processing new header")
Expand Down
8 changes: 1 addition & 7 deletions integration-tests/testsetups/ocr.go
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ func (o *OCRSoakTest) testLoop(testDuration time.Duration, newValue int) {
n := o.Config.GetNetworkConfig()

// Schedule blockchain re-org if needed
// Reorg only avaible for Simulated Geth
// Reorg only available for Simulated Geth
if n.IsSimulatedGethSelected() && n.GethReorgConfig.Enabled {
var reorgDelay time.Duration
if n.GethReorgConfig.DelayCreate.Duration > testDuration {
Expand Down Expand Up @@ -1314,9 +1314,3 @@ func (l ocrTestChaosListener) OnChaosEnded(_ havoc.Chaos) {

func (l ocrTestChaosListener) OnChaosStatusUnknown(_ havoc.Chaos) {
}

func (l ocrTestChaosListener) OnScheduleCreated(_ havoc.Schedule) {
}

func (l ocrTestChaosListener) OnScheduleDeleted(_ havoc.Schedule) {
}
Loading

0 comments on commit 8f1eae7

Please sign in to comment.