Merge branch 'develop' into bump/solana-v2.0.16

.mockery.yaml

@@ -0,0 +1,39 @@
+dir: "{{ .InterfaceDir }}/mocks"
+mockname: "{{ .InterfaceName }}"
+outpkg: mocks
+filename: "{{ .InterfaceName | snakecase }}.go"
+packages:
+  github.com/smartcontractkit/chainlink-solana/pkg/monitoring:
+    interfaces:
+      ChainReader:
+  github.com/smartcontractkit/chainlink-solana/pkg/monitoring/metrics:
+    interfaces:
+      FeedBalances:
+      Fees:
+        config:
+          filename: "Fees.go"
+      NetworkFees:
+      NodeBalances:
+      NodeSuccess:
+      ReportObservations:
+      SlotHeight:
+  github.com/smartcontractkit/chainlink-solana/pkg/solana/client:
+    interfaces:
+      ReaderWriter:
+  github.com/smartcontractkit/chainlink-solana/pkg/solana/config:
+    interfaces:
+      Config:
+        config:
+          filename: config.go
+          case: underscore
+  github.com/smartcontractkit/chainlink-solana/pkg/solana/fees:
+    interfaces:
+      Estimator:
+        config:
+          filename: "Estimator.go"
+  github.com/smartcontractkit/chainlink-solana/pkg/solana/txm:
+    interfaces:
+      SimpleKeystore:
+        config:
+          filename: simple_keystore.go
+          case: underscore

Makefile

@@ -111,6 +111,7 @@ rm-mocked:
 .PHONY: generate
 generate: mockery gomods
 	gomods -w go generate -x ./...
+	mockery
 
 .PHONY: lint-go-integration-tests
 lint-go-integration-tests:

pkg/monitoring/chain_reader.go

@@ -10,7 +10,6 @@ import (
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
 )
 
-//go:generate mockery --name ChainReader --output ./mocks/
 type ChainReader interface {
 	GetState(ctx context.Context, account solana.PublicKey, commitment rpc.CommitmentType) (state pkgSolana.State, blockHeight uint64, err error)
 	GetLatestTransmission(ctx context.Context, account solana.PublicKey, commitment rpc.CommitmentType) (answer pkgSolana.Answer, blockHeight uint64, err error)

pkg/monitoring/metrics/feedbalances.go

@@ -8,8 +8,6 @@ import (
 	commonMonitoring "github.com/smartcontractkit/chainlink-common/pkg/monitoring"
 )
 
-//go:generate mockery --name FeedBalances --output ./mocks/
-
 type FeedBalances interface {
 	Exists(balanceAccountName string) (*prometheus.GaugeVec, bool)
 	SetBalance(balance uint64, balanceAccountName string, feedInput FeedInput)

pkg/monitoring/metrics/fees.go

@@ -7,8 +7,6 @@ import (
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/fees"
 )
 
-//go:generate mockery --name Fees --output ./mocks/
-
 type Fees interface {
 	Set(txFee uint64, computeUnitPrice fees.ComputeUnitPrice, feedInput FeedInput)
 	Cleanup(feedInput FeedInput)