Skip to content

Commit 7c431e4

Browse files
skudasovskudasov
authored
remove non-evm integrations framework interfaces (#151)
1 parent f53fbcc commit 7c431e4

File tree

4 files changed

+16
-66
lines changed

4 files changed

+16
-66
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ require (
1717
github.com/davecgh/go-spew v1.1.1
1818
github.com/gagliardetto/gofuzz v1.2.2
1919
github.com/gagliardetto/treeout v0.1.4
20-
github.com/onsi/ginkgo/v2 v2.0.0
20+
github.com/onsi/ginkgo/v2 v2.1.0
2121
github.com/onsi/gomega v1.17.0
2222
github.com/pkg/errors v0.9.1
2323
github.com/prometheus/client_golang v1.12.0
2424
github.com/rs/zerolog v1.26.1
2525
github.com/smartcontractkit/chainlink-relay v0.0.0-20220127054158-7bb490de0ddb
26-
github.com/smartcontractkit/integrations-framework v1.0.37-0.20220125141905-c76d1f04870f
26+
github.com/smartcontractkit/integrations-framework v1.0.41
2727
go.uber.org/atomic v1.9.0
2828
go.uber.org/zap v1.19.1
2929
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e

‎go.sum

+4-6
Original file line numberDiff line numberDiff line change
@@ -1856,8 +1856,8 @@ github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k
18561856
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
18571857
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
18581858
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
1859-
github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
1860-
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
1859+
github.com/onsi/ginkgo/v2 v2.1.0 h1:Rj+Was8Gt/ICSZY/CihVKK2cGy3rDqBYKSxVnmOXZzI=
1860+
github.com/onsi/ginkgo/v2 v2.1.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
18611861
github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
18621862
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
18631863
github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
@@ -2123,16 +2123,14 @@ github.com/smartcontractkit/chainlink v1.0.1-0.20211130190746-c1f78221a5e7/go.mo
21232123
github.com/smartcontractkit/chainlink v1.0.1-0.20211207182844-d545260b5c89/go.mod h1:9kt1TqmBk6optJtwBM0wfnRrq7WPM0gwtGlD3vpU8Ms=
21242124
github.com/smartcontractkit/chainlink v1.0.1-0.20211209223503-68928efa429a h1:no2PzLdUgYp4fLkVTGCiAuFx2ySAi2cjRjCmFeuViMc=
21252125
github.com/smartcontractkit/chainlink v1.0.1-0.20211209223503-68928efa429a/go.mod h1:PSKo1vbT0/cUSbgH/rKNTDwWJyX8bc6M9/YVRe/nrXU=
2126-
github.com/smartcontractkit/chainlink-relay v0.0.0-20220126142536-3aae7ed1e37c h1:ccrPbNlQYFqHSf9+q4hZzglgzAdxMyFkFlBSftpjnUQ=
2127-
github.com/smartcontractkit/chainlink-relay v0.0.0-20220126142536-3aae7ed1e37c/go.mod h1:ojPwXEIk6xHFAoVMM5PoybiN/ici+FrVs5pI9/lq/WI=
21282126
github.com/smartcontractkit/chainlink-relay v0.0.0-20220127054158-7bb490de0ddb h1:MvXSlZ6MMGvBi5n//mxCLWFlx2uR25BWWovWFm+oS8o=
21292127
github.com/smartcontractkit/chainlink-relay v0.0.0-20220127054158-7bb490de0ddb/go.mod h1:ojPwXEIk6xHFAoVMM5PoybiN/ici+FrVs5pI9/lq/WI=
21302128
github.com/smartcontractkit/chainlink-solana v0.0.0-20211203133247-1fbcc7f330d5/go.mod h1:NxZZQ0m2AGQ5vR1HptHkAyYCd68XA03SI2dEvkaalbs=
21312129
github.com/smartcontractkit/chainlink-solana v0.0.0-20211207185700-a24214ba7afd/go.mod h1:NVHHwrCgC/7J0I872/uVgk0jEpyJIXEGAxZHrbgt190=
21322130
github.com/smartcontractkit/helmenv v1.0.27 h1:BVxTQZQlFElh6YVK8mY9LSljX7uyx4jyImmHh/fMqEo=
21332131
github.com/smartcontractkit/helmenv v1.0.27/go.mod h1:ef0doolSZf8ckqaWMIK2M+EPXdIKYVzttd6EXaCgCK4=
2134-
github.com/smartcontractkit/integrations-framework v1.0.37-0.20220125141905-c76d1f04870f h1:H/9yoU5QNrrTcq0wc9xxWwqwtqhDEuK8QxxgRkoqlRw=
2135-
github.com/smartcontractkit/integrations-framework v1.0.37-0.20220125141905-c76d1f04870f/go.mod h1:uAO2/yrAdSDJk9YrPi+MF/xg48pQ7khHr9pwQgEkJWQ=
2132+
github.com/smartcontractkit/integrations-framework v1.0.41 h1:nf/0k2fIKlhCsFlvHfhMCrfxyNHzIV7YnAc95Q7Vv50=
2133+
github.com/smartcontractkit/integrations-framework v1.0.41/go.mod h1:6CJgjZr1TIybPOHu4CewrKRgJUUbF6bqUGYFkC5NslI=
21362134
github.com/smartcontractkit/libocr v0.0.0-20201203233047-5d9b24f0cbb5/go.mod h1:bfdSuLnBWCkafDvPGsQ1V6nrXhg046gh227MKi4zkpc=
21372135
github.com/smartcontractkit/libocr v0.0.0-20211117215336-6c9726817b2d/go.mod h1:nq3crM3wVqnyMlM/4ZydTuJ/WyCapAsOt7P94oRgSPg=
21382136
github.com/smartcontractkit/libocr v0.0.0-20211202172717-e8b0536a572e/go.mod h1:nq3crM3wVqnyMlM/4ZydTuJ/WyCapAsOt7P94oRgSPg=

‎tests/e2e/common/test_common.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ const (
4444
type OCRv2TestState struct {
4545
Env *environment.Environment
4646
ChainlinkNodes []client.Chainlink
47-
ContractDeployer contracts.ContractDeployer
47+
ContractDeployer *solclient.ContractDeployer
4848
LinkToken contracts.LinkToken
49-
Store contracts.OCRv2Store
49+
Store *solclient.Store
5050
StoreAuth string
51-
BillingAC contracts.OCRv2AccessController
52-
RequesterAC contracts.OCRv2AccessController
53-
OCR2 contracts.OCRv2
51+
BillingAC *solclient.AccessController
52+
RequesterAC *solclient.AccessController
53+
OCR2 *solclient.OCRv2
5454
OffChainConfig contracts.OffChainAggregatorV2Config
5555
NodeKeysBundle []NodeKeysBundle
5656
MockServer *client.MockserverClient
@@ -137,7 +137,7 @@ func (m *OCRv2TestState) SetupClients() {
137137
}
138138

139139
func (m *OCRv2TestState) DumpContracts() error {
140-
s := ContractsState{Feed: m.Store.(*solclient.Store).Feed.PrivateKey.String()}
140+
s := ContractsState{Feed: m.Store.Feed.PrivateKey.String()}
141141
d, err := json.Marshal(s)
142142
if err != nil {
143143
return err

‎tests/e2e/solclient/deployer.go

+4-52
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,7 @@ type ContractDeployer struct {
4848
Env *environment.Environment
4949
}
5050

51-
func (c *ContractDeployer) DeployOCRv2Proxy(addr string) (contracts.OCRv2Proxy, error) {
52-
panic("implement me")
53-
}
54-
55-
func (c *ContractDeployer) DeployOCRv2ValidatorProxy(addr string) (contracts.OCRv2Proxy, error) {
56-
panic("implement me")
57-
}
58-
59-
func (c *ContractDeployer) DeployOCRv2Flags(lowAccessController string, raiseAccessController string) (contracts.OCRv2Flags, error) {
60-
panic("implement me")
61-
}
62-
63-
func (c *ContractDeployer) DeployOCRv2Validator(threshold uint32, flags string) (contracts.OCRv2Flags, error) {
64-
panic("implement me")
65-
}
66-
67-
func (c *ContractDeployer) DeployOCRv2Store(billingAC string) (contracts.OCRv2Store, error) {
51+
func (c *ContractDeployer) DeployOCRv2Store(billingAC string) (*Store, error) {
6852
programWallet := c.Client.ProgramWallets["store-keypair.json"]
6953
payer := c.Client.DefaultWallet
7054
accInstruction, err := c.Client.CreateAccInstr(c.Client.Accounts.Store, StoreAccountSize, programWallet.PublicKey())
@@ -111,38 +95,6 @@ func (c *ContractDeployer) DeployOCRv2Store(billingAC string) (contracts.OCRv2St
11195
}, nil
11296
}
11397

114-
func (c *ContractDeployer) Balance() (*big.Float, error) {
115-
panic("implement me")
116-
}
117-
118-
func (c *ContractDeployer) DeployStorageContract() (contracts.Storage, error) {
119-
panic("implement me")
120-
}
121-
122-
func (c *ContractDeployer) DeployAPIConsumer(linkAddr string) (contracts.APIConsumer, error) {
123-
panic("implement me")
124-
}
125-
126-
func (c *ContractDeployer) DeployOracle(linkAddr string) (contracts.Oracle, error) {
127-
panic("implement me")
128-
}
129-
130-
func (c *ContractDeployer) DeployReadAccessController() (contracts.ReadAccessController, error) {
131-
panic("implement me")
132-
}
133-
134-
func (c *ContractDeployer) DeployFlags(rac string) (contracts.Flags, error) {
135-
panic("implement me")
136-
}
137-
138-
func (c *ContractDeployer) DeployDeviationFlaggingValidator(flags string, flaggingThreshold *big.Int) (contracts.DeviationFlaggingValidator, error) {
139-
panic("implement me")
140-
}
141-
142-
func (c *ContractDeployer) DeployFluxAggregatorContract(linkAddr string, fluxOptions contracts.FluxAggregatorOptions) (contracts.FluxAggregator, error) {
143-
panic("implement me")
144-
}
145-
14698
func (c *ContractDeployer) addMintToAccInstr(instr *[]solana.Instruction, dest *solana.Wallet, amount uint64) error {
14799
*instr = append(*instr, token.NewMintToInstruction(
148100
amount,
@@ -154,7 +106,7 @@ func (c *ContractDeployer) addMintToAccInstr(instr *[]solana.Instruction, dest *
154106
return nil
155107
}
156108

157-
func (c *ContractDeployer) DeployLinkTokenContract() (contracts.LinkToken, error) {
109+
func (c *ContractDeployer) DeployLinkTokenContract() (*LinkToken, error) {
158110
var err error
159111
payer := c.Client.DefaultWallet
160112

@@ -202,7 +154,7 @@ func (c *ContractDeployer) DeployLinkTokenContract() (contracts.LinkToken, error
202154
}, nil
203155
}
204156

205-
func (c *ContractDeployer) DeployOCRv2(billingControllerAddr string, requesterControllerAddr string, linkTokenAddr string) (contracts.OCRv2, error) {
157+
func (c *ContractDeployer) DeployOCRv2(billingControllerAddr string, requesterControllerAddr string, linkTokenAddr string) (*OCRv2, error) {
206158
programWallet := c.Client.ProgramWallets["ocr2-keypair.json"]
207159
payer := c.Client.DefaultWallet
208160
ocrAccInstruction, err := c.Client.CreateAccInstr(c.Client.Accounts.OCR, OCRAccountAccountSize, programWallet.PublicKey())
@@ -295,7 +247,7 @@ func (c *ContractDeployer) DeployProgramRemote(programName string) error {
295247
return nil
296248
}
297249

298-
func (c *ContractDeployer) DeployOCRv2AccessController() (contracts.OCRv2AccessController, error) {
250+
func (c *ContractDeployer) DeployOCRv2AccessController() (*AccessController, error) {
299251
programWallet := c.Client.ProgramWallets["access_controller-keypair.json"]
300252
payer := c.Client.DefaultWallet
301253
stateAcc := solana.NewWallet()

0 commit comments

Comments
 (0)