@@ -18,6 +18,7 @@ import (
1818 "github.com/smartcontractkit/chainlink-common/pkg/logger"
1919 "github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
2020 "github.com/smartcontractkit/chainlink-common/pkg/types"
21+ soltypes "github.com/smartcontractkit/chainlink-common/pkg/types/solana"
2122
2223 "github.com/smartcontractkit/chainlink-solana/contracts/generated/buffer_payload"
2324 "github.com/smartcontractkit/chainlink-solana/integration-tests/utils"
@@ -76,25 +77,25 @@ func Test_BufferPayload(t *testing.T) {
7677 contractName := "buffer"
7778 methodName := "execute"
7879
79- cwConfig := chainwriter. ChainWriterConfig {
80- Programs : map [string ]chainwriter .ProgramConfig {
80+ cwConfig := soltypes. ContractWriterConfig {
81+ Programs : map [string ]soltypes .ProgramConfig {
8182 contractName : {
82- Methods : map [string ]chainwriter .MethodConfig {
83+ Methods : map [string ]soltypes .MethodConfig {
8384 methodName : {
8485 FromAddress : sender .PublicKey ().String (),
8586 ChainSpecificName : "execute" ,
8687 ComputeUnitLimitOverhead : 150_000 ,
8788 BufferPayloadMethod : "CCIPExecutionReportBuffer" ,
88- Accounts : []chainwriter .Lookup {
89+ Accounts : []soltypes .Lookup {
8990 {
90- AccountConstant : & chainwriter .AccountConstant {
91+ AccountConstant : & soltypes .AccountConstant {
9192 Address : sender .PublicKey ().String (),
9293 IsSigner : true ,
9394 IsWritable : true ,
9495 },
9596 },
9697 {
97- AccountConstant : & chainwriter .AccountConstant {
98+ AccountConstant : & soltypes .AccountConstant {
9899 Address : solana .SystemProgramID .String (),
99100 IsSigner : false ,
100101 IsWritable : false ,
@@ -176,7 +177,7 @@ func Test_BufferPayload(t *testing.T) {
176177 })
177178}
178179
179- func initializeAndRunCW (t * testing.T , lggr logger.Logger , multiClient client.MultiClient , txm * txm.Txm , config chainwriter. ChainWriterConfig ) * chainwriter.SolanaChainWriterService {
180+ func initializeAndRunCW (t * testing.T , lggr logger.Logger , multiClient client.MultiClient , txm * txm.Txm , config soltypes. ContractWriterConfig ) * chainwriter.SolanaChainWriterService {
180181 cw , err := chainwriter .NewSolanaChainWriterService (lggr , multiClient , txm , nil , config )
181182 require .NoError (t , err )
182183 servicetest .Run (t , cw )
0 commit comments