Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[QA-242] Update test bootstrap spec config #434

Merged
merged 1 commit into from Nov 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .tool-versions
@@ -1,9 +1,10 @@
nodejs 14.19.1
yarn 1.22.19
rust 1.59.0
golang 1.19.3
golangci-lint 1.45.2
pulumi 3.40.1
ginkgo 2.4.0
ginkgo 2.5.1
actionlint 1.6.22
shellcheck 0.8.0
helm 3.9.4
Expand Down
10 changes: 4 additions & 6 deletions tests/e2e/common/common.go
Expand Up @@ -283,9 +283,8 @@ func CreateJobsForContract(contractNodeInfo *ContractNodeInfo) error {
},
}
jobSpec := &client.OCR2TaskJobSpec{
Name: fmt.Sprintf("sol-OCRv2-%s-%s", "bootstrap", uuid.NewV4().String()),
JobType: "bootstrap",
ObservationSource: contractNodeInfo.BootstrapBridgeInfo.ObservationSource,
Name: fmt.Sprintf("sol-OCRv2-%s-%s", "bootstrap", uuid.NewV4().String()),
JobType: "bootstrap",
OCR2OracleSpec: job.OCR2OracleSpec{
ContractID: contractNodeInfo.OCR2.Address(),
Relay: ChainName,
Expand All @@ -295,12 +294,11 @@ func CreateJobsForContract(contractNodeInfo *ContractNodeInfo) error {
TransmitterID: null.StringFrom(contractNodeInfo.BootstrapNodeKeysBundle.TXKey.Data.ID),
ContractConfigConfirmations: 1,
ContractConfigTrackerPollInterval: models.Interval(15 * time.Second),
PluginType: "median",
PluginConfig: pluginConfigToTomlFormat(contractNodeInfo.BootstrapBridgeInfo.JuelsSource),
},
}
if _, err := contractNodeInfo.BootstrapNode.MustCreateJob(jobSpec); err != nil {
return fmt.Errorf("failed creating job for boostrap node: %w", err)
s, _ := jobSpec.String()
return fmt.Errorf("failed creating job for boostrap node: %w\n spec:\n%s", err, s)
}
for nIdx, n := range contractNodeInfo.Nodes {
jobSpec := &client.OCR2TaskJobSpec{
Expand Down
32 changes: 16 additions & 16 deletions tests/go.mod
Expand Up @@ -9,16 +9,16 @@ require (
github.com/gagliardetto/binary v0.7.1
github.com/gagliardetto/solana-go v1.4.1-0.20220428092759-5250b4abbb27
github.com/lib/pq v1.10.7
github.com/onsi/ginkgo/v2 v2.5.0
github.com/onsi/ginkgo/v2 v2.5.1
github.com/onsi/gomega v1.24.1
github.com/rs/zerolog v1.28.0
github.com/satori/go.uuid v1.2.0
github.com/smartcontractkit/chainlink v1.9.0
github.com/smartcontractkit/chainlink-env v0.2.52
github.com/smartcontractkit/chainlink-env v0.2.55
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20221027174234-50b4d94d7135
github.com/smartcontractkit/chainlink-testing-framework v1.7.10
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221108194954-9075d1844d90
github.com/smartcontractkit/libocr v0.0.0-20220812191430-db92a9fdaa52
github.com/smartcontractkit/chainlink-testing-framework v1.8.5
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221130214003-2872a0d0504f
github.com/smartcontractkit/libocr v0.0.0-20221121171434-482da3ed36d8
golang.org/x/crypto v0.1.0
golang.org/x/sync v0.1.0
gopkg.in/guregu/null.v4 v4.0.0
Expand Down Expand Up @@ -89,7 +89,7 @@ require (
github.com/fvbommel/sortorder v1.0.2 // indirect
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
github.com/gagliardetto/treeout v0.1.4 // indirect
github.com/getsentry/sentry-go v0.13.0 // indirect
github.com/getsentry/sentry-go v0.15.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19 // indirect
github.com/gin-gonic/gin v1.8.1 // indirect
Expand All @@ -104,10 +104,10 @@ require (
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.10.1 // indirect
github.com/go-playground/validator/v10 v10.11.1 // indirect
github.com/go-resty/resty/v2 v2.7.0 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/goccy/go-json v0.9.7 // indirect
github.com/goccy/go-json v0.9.11 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/protobuf v1.3.3 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down Expand Up @@ -170,7 +170,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/klauspost/compress v1.15.11 // indirect
github.com/koron/go-ssdp v0.0.2 // indirect
github.com/leanovate/gopter v0.2.10-0.20210127095200-9abe2343507a // indirect
github.com/leodido/go-urn v1.2.1 // indirect
Expand Down Expand Up @@ -260,7 +260,7 @@ require (
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/tsdb v0.10.0 // indirect
github.com/pyroscope-io/client v0.3.0 // indirect
github.com/pyroscope-io/client v0.4.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
github.com/regen-network/cosmos-proto v0.3.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
Expand All @@ -270,14 +270,14 @@ require (
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
github.com/scylladb/go-reflectx v1.0.1 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/shirou/gopsutil/v3 v3.22.9 // indirect
github.com/shirou/gopsutil/v3 v3.22.10 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/slack-go/slack v0.11.4 // indirect
github.com/smartcontractkit/chainlink-relay v0.1.6-0.20221025223751-9b407cff57eb // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20220930034704-572ac07611cb // indirect
github.com/smartcontractkit/ocr2keepers v0.4.8 // indirect
github.com/smartcontractkit/ocr2vrf v0.0.0-20221103213748-db2f67990850 // indirect
github.com/smartcontractkit/ocr2vrf v0.0.0-20221108213147-df72abedd302 // indirect
github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb // indirect
github.com/smartcontractkit/terra.go v1.0.3-0.20220108002221-62b39252ee16 // indirect
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
Expand Down Expand Up @@ -326,22 +326,22 @@ require (
go.uber.org/zap v1.23.0 // indirect
golang.org/x/exp v0.0.0-20220608143224-64259d1afd70 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.2.0 // indirect
golang.org/x/oauth2 v0.1.0 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/term v0.2.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.1.0 // indirect
golang.org/x/tools v0.2.0 // indirect
golang.org/x/tools v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220712132514-bdd2acd4974d // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down