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.

Sign up for GitHub

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

switch from chainlink-relay to chainlink-common #555

Merged
merged 1 commit into from
Nov 17, 2023
Merged

switch from chainlink-relay to chainlink-common #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/monitoring/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"fmt"

"github.com/gagliardetto/solana-go/rpc"
"github.com/smartcontractkit/chainlink-relay/pkg/logger"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"

"github.com/smartcontractkit/chainlink-common/pkg/logger"
relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"

"github.com/smartcontractkit/chainlink-solana/pkg/monitoring"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/pelletier/go-toml/v2 v2.1.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.17.0
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231020230319-2ede955d1dc9
github.com/smartcontractkit/chainlink-common v0.1.7-0.20231117021201-6814387d8d3e
github.com/smartcontractkit/libocr v0.0.0-20230925165524-ffa38fe11ef8
github.com/stretchr/testify v1.8.4
go.uber.org/multierr v1.11.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231020230319-2ede955d1dc9 h1:fFD5SgSJtnXvkGLK3CExNKpUIz4sGrNNkKv3Ljw63Hk=
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231020230319-2ede955d1dc9/go.mod h1:M9U1JV7IQi8Sfj4JR1qSi1tIh6omgW78W/8SHN/8BUQ=
github.com/smartcontractkit/chainlink-common v0.1.7-0.20231117021201-6814387d8d3e h1:Fsx5IJDD14wdCAe2lEI1xgztIvzjiE2iVHvYzg/grew=
github.com/smartcontractkit/chainlink-common v0.1.7-0.20231117021201-6814387d8d3e/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=
github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4=
github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU=
Expand Down
19 changes: 9 additions & 10 deletions integration-tests/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,30 @@ import (
"golang.org/x/crypto/curve25519"
"gopkg.in/guregu/null.v4"

"github.com/smartcontractkit/chainlink-solana/pkg/solana"
"github.com/smartcontractkit/libocr/offchainreporting2/confighelper"
"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2/types"

"github.com/smartcontractkit/chainlink-common/pkg/config"
ctf_test_env "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
"github.com/smartcontractkit/chainlink-testing-framework/k8s/environment"
"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/alias"
"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/chainlink"
mock_adapter "github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/mock-adapter"
"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/sol"

"github.com/smartcontractkit/libocr/offchainreporting2/confighelper"
"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2/types"

"github.com/smartcontractkit/chainlink-testing-framework/utils/ptr"
"github.com/smartcontractkit/chainlink/integration-tests/client"
"github.com/smartcontractkit/chainlink/integration-tests/contracts"
"github.com/smartcontractkit/chainlink/integration-tests/docker/test_env"
"github.com/smartcontractkit/chainlink/integration-tests/types/config/node"
cl "github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
"github.com/smartcontractkit/chainlink/v2/core/services/job"
"github.com/smartcontractkit/chainlink/v2/core/store/models"

relay_utils "github.com/smartcontractkit/chainlink-relay/pkg/utils"
test_env_sol "github.com/smartcontractkit/chainlink-solana/integration-tests/docker/test_env"
"github.com/smartcontractkit/chainlink-solana/integration-tests/solclient"
"github.com/smartcontractkit/chainlink-solana/pkg/solana"
solcfg "github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
ctf_test_env "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
cl "github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
)

const (
Expand Down Expand Up @@ -501,7 +500,7 @@ func (c *Common) DefaultNodeConfig() *cl.Config {
Nodes: []*solcfg.Node{
{
Name: ptr.Ptr("primary"),
URL: relay_utils.MustParseURL(c.SolanaUrl),
URL: config.MustParseURL(c.SolanaUrl),
},
},
}
Expand Down
12 changes: 6 additions & 6 deletions integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ require (
github.com/onsi/gomega v1.27.8
github.com/rs/zerolog v1.30.0
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231115124244-8303409abccd
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05
github.com/smartcontractkit/chainlink-common v0.1.7-0.20231117021201-6814387d8d3e
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231116220215-93510f138ff6
github.com/smartcontractkit/chainlink-testing-framework v1.19.0
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116210131-a9d81ae52ccd
github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116210131-a9d81ae52ccd
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116224343-7780eb63d8dc
github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116224343-7780eb63d8dc
github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7
github.com/stretchr/testify v1.8.4
github.com/testcontainers/testcontainers-go v0.23.0
Expand Down Expand Up @@ -379,8 +379,8 @@ require (
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/slack-go/slack v0.12.2 // indirect
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb // indirect
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231116223324-56d60ee456c3 // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231116220530-9d5db8010d3b // indirect
github.com/smartcontractkit/ocr2keepers v0.7.28 // indirect
github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 // indirect
github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
Expand Down
20 changes: 10 additions & 10 deletions integration-tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2355,18 +2355,18 @@ github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ
github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo=
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 h1:Pt6c7bJU9wIN6PQQnmN8UmYYH6lpfiQ6U/B8yEC2s5s=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255/go.mod h1:EHppaccd/LTlTMI2o4dmBHe4BknEgEFFDjDGMNuGb3k=
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231115124244-8303409abccd h1:PRVJxNK67pQWufXuB1cxckH/xZkcQFDy8KjN9ZYqong=
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231115124244-8303409abccd/go.mod h1:rOayi690YxLlkQy959PD8INhOAIAUi9LoN0G+J/CEf4=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb h1:HiluOfEVGOQTM6BTDImOqYdMZZ7qq7fkZ3TJdmItNr8=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb/go.mod h1:/30flFG4L/iCYAFeA3DUzR0xuHSxAMONiWTzyzvsNwo=
github.com/smartcontractkit/chainlink-common v0.1.7-0.20231117021201-6814387d8d3e h1:Fsx5IJDD14wdCAe2lEI1xgztIvzjiE2iVHvYzg/grew=
github.com/smartcontractkit/chainlink-common v0.1.7-0.20231117021201-6814387d8d3e/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231116223324-56d60ee456c3 h1:Z26fE3PWqlQRqW7QSRYCSpfTXzHkPqcppMPMASU8Z6g=
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231116223324-56d60ee456c3/go.mod h1:EnvRRl5epzfFyXzo2JkQAh1N3EvDZOF5+ExjId4uyi0=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231116220530-9d5db8010d3b h1:KWfn3upgUYbOoOEUAuTJndS2OOmvO67h78P/oF3kbwM=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231116220530-9d5db8010d3b/go.mod h1:ShLh2mumD8ShuRBS6ONHDaW6BDloVA3fAbGysJg4Ht4=
github.com/smartcontractkit/chainlink-testing-framework v1.19.0 h1:ungyY1gYcXCtmdX2yCon8pkx9HgPPLg4aNAhKNZFP5c=
github.com/smartcontractkit/chainlink-testing-framework v1.19.0/go.mod h1:zScXRqmvbyTFUooyLYrOp4+V/sFPUbFJNRc72YmnuIk=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116210131-a9d81ae52ccd h1:55Zi3Ed6+xJYs+qCORNPVvoitUh/WP8B0AwUtWZ+m3M=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116210131-a9d81ae52ccd/go.mod h1:4/r8AW79/ZW0tED8GfOjO17AyXyEDZLdgeeZeLpkT1c=
github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116210131-a9d81ae52ccd h1:hBerlu8Kus3+a+IUjLiwRmIzLMW663kEFxBCbiFOjrQ=
github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116210131-a9d81ae52ccd/go.mod h1:8wHqNlLPdwa9ByE9lPnhrLHdlvfjZI1uj5RRrhrT4Ys=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116224343-7780eb63d8dc h1:avcEXOkSX95tITMGImqGl1nwX+cmm+q74cXRiVHdBbQ=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231116224343-7780eb63d8dc/go.mod h1:JATrsArYN6wOfkjQ0i/UHnUTXrCK6v5Qr6WwPmG+vQc=
github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116224343-7780eb63d8dc h1:JgldMjvhBvsYRRhcfHZrsX35sMMXep+ZD46x3lP/oDE=
github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20231116224343-7780eb63d8dc/go.mod h1:A3oWdc95WLNcQSlxmDuQoEnmVY1uJVPNH+BEElTMJho=
github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=
github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4=
github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU=
Expand Down
2 changes: 1 addition & 1 deletion pkg/monitoring/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"time"

relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
)

type SolanaConfig struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/monitoring/feed_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (
"math/big"

"github.com/gagliardetto/solana-go"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"

relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
)

type SolanaFeedConfig struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/monitoring/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import (

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"

relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
)

var BalanceAccountNames = []string{
Expand Down
3 changes: 2 additions & 1 deletion pkg/monitoring/node_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"fmt"
"io"

relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
"github.com/smartcontractkit/libocr/offchainreporting2/types"

relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
)

type SolanaNodeConfig struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/monitoring/prometheus_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import (
"sync"

"github.com/gagliardetto/solana-go"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"

relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
)

func NewPrometheusExporterFactory(
Expand Down
5 changes: 3 additions & 2 deletions pkg/monitoring/prometheus_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import (
"testing"
"time"

relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
"github.com/stretchr/testify/require"

relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
)

func TestPrometheusExporter(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/monitoring/source_balances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (

"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"

relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
)

type Balances struct {
Expand Down
7 changes: 4 additions & 3 deletions pkg/monitoring/source_envelope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ import (

"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/event"
pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"go.uber.org/multierr"

relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/event"
pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
)

func NewEnvelopeSourceFactory(
Expand Down
7 changes: 4 additions & 3 deletions pkg/monitoring/source_envelope_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ import (
bin "github.com/gagliardetto/binary"
"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion pkg/monitoring/source_txresults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (

"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"

relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
)

func NewTxResultsSourceFactory(
Expand Down
5 changes: 3 additions & 2 deletions pkg/monitoring/testutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (
"time"

"github.com/gagliardetto/solana-go"
"github.com/smartcontractkit/chainlink-relay/pkg/logger"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"

"github.com/smartcontractkit/chainlink-common/pkg/logger"
relayMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
)

// Generators
Expand Down
2 changes: 1 addition & 1 deletion pkg/solana/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-relay/pkg/logger"
"github.com/smartcontractkit/chainlink-common/pkg/logger"

"github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
"github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
Expand Down
20 changes: 9 additions & 11 deletions pkg/solana/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@ import (
"github.com/pkg/errors"
"go.uber.org/multierr"

"github.com/smartcontractkit/chainlink-relay/pkg/chains"
"github.com/smartcontractkit/chainlink-relay/pkg/logger"
"github.com/smartcontractkit/chainlink-relay/pkg/loop"
"github.com/smartcontractkit/chainlink-relay/pkg/services"
"github.com/smartcontractkit/chainlink-relay/pkg/types"
relaytypes "github.com/smartcontractkit/chainlink-relay/pkg/types"
"github.com/smartcontractkit/chainlink-relay/pkg/utils"

"github.com/smartcontractkit/chainlink-common/pkg/chains"
"github.com/smartcontractkit/chainlink-common/pkg/logger"
"github.com/smartcontractkit/chainlink-common/pkg/loop"
"github.com/smartcontractkit/chainlink-common/pkg/services"
"github.com/smartcontractkit/chainlink-common/pkg/types"
relaytypes "github.com/smartcontractkit/chainlink-common/pkg/types"
"github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
"github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
"github.com/smartcontractkit/chainlink-solana/pkg/solana/db"
Expand Down Expand Up @@ -80,7 +78,7 @@ func NewChain(cfg *TOMLConfig, opts ChainOpts) (Chain, error) {
var _ Chain = (*chain)(nil)

type chain struct {
utils.StartStopOnce
services.StateMachine
id string
cfg *TOMLConfig
txm *txm.Txm
Expand Down Expand Up @@ -386,13 +384,13 @@ func (c *chain) Close() error {

func (c *chain) Ready() error {
return multierr.Combine(
c.StartStopOnce.Ready(),
c.StateMachine.Ready(),
c.txm.Ready(),
)
}

func (c *chain) HealthReport() map[string]error {
report := map[string]error{c.Name(): c.StartStopOnce.Healthy()}
report := map[string]error{c.Name(): c.Healthy()}
services.CopyHealth(report, c.txm.HealthReport())
return report
}
Expand Down
Loading
Loading