From 39fc5e50a9dd10353f977a0cc51f02a9f50babf1 Mon Sep 17 00:00:00 2001 From: cam-schultz Date: Thu, 9 Nov 2023 21:00:28 +0000 Subject: [PATCH] subnet-evm v0.5.9 --- go.mod | 10 ++-- go.sum | 16 ++--- vms/evm/mocks/mock_eth_client.go | 89 +++++++++++++++++----------- vms/mocks/mock_destination_client.go | 12 ++-- 4 files changed, 75 insertions(+), 52 deletions(-) diff --git a/go.mod b/go.mod index c43d2032..67a82887 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,10 @@ module github.com/ava-labs/awm-relayer go 1.18 require ( - github.com/ava-labs/avalanchego v1.10.14 - github.com/ava-labs/subnet-evm v0.5.8 - github.com/ava-labs/teleporter v0.0.0-20231107202133-eea4d6312c35 + github.com/ava-labs/avalanche-network-runner v1.7.3-0.20231026153158-2931f8a448d9 + github.com/ava-labs/avalanchego v1.10.15 + github.com/ava-labs/subnet-evm v0.5.9 + github.com/ava-labs/teleporter v0.0.0-20231109205404-3a226fa468c8 github.com/ethereum/go-ethereum v1.12.0 github.com/onsi/ginkgo/v2 v2.13.0 github.com/onsi/gomega v1.29.0 @@ -20,8 +21,7 @@ require ( require ( github.com/Microsoft/go-winio v0.5.2 // indirect - github.com/ava-labs/avalanche-network-runner v1.7.3-0.20231026153158-2931f8a448d9 // indirect - github.com/ava-labs/coreth v0.12.7-rc.1 // indirect + github.com/ava-labs/coreth v0.12.8-rc.1 // indirect github.com/cockroachdb/errors v1.9.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect diff --git a/go.sum b/go.sum index 694127de..af5b0908 100644 --- a/go.sum +++ b/go.sum @@ -63,14 +63,14 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/ava-labs/avalanche-network-runner v1.7.3-0.20231026153158-2931f8a448d9 h1:mTxfmBxmV8GSW0PUt0Qj/Obetzsw0gP6dtoNHaKW2+o= github.com/ava-labs/avalanche-network-runner v1.7.3-0.20231026153158-2931f8a448d9/go.mod h1:M9FC+xU4hQU3Botux8V8j574YETeX6tMvxiOmqLfl5c= -github.com/ava-labs/avalanchego v1.10.14 h1:1jTMrikYD49Pb64ZLUi2z2BnNGLzIGip4fValq6/YfE= -github.com/ava-labs/avalanchego v1.10.14/go.mod h1:En/ti2xoxQqJuN6t9ne2ogckU9leuZzTjl5mbEsfjTc= -github.com/ava-labs/coreth v0.12.7-rc.1 h1:fvjow2Jqkq1RNtW4v2Kx0DdTVp+3+fCY421TxpDDRfM= -github.com/ava-labs/coreth v0.12.7-rc.1/go.mod h1:sNbwitXv4AhLvWpSqy6V8yzkhGFeWBQFD31/xiRDJ5M= -github.com/ava-labs/subnet-evm v0.5.8 h1:CHDCgZFpvKcgAGTiYDOrDXC5My09L8DNct6NsNiEK/U= -github.com/ava-labs/subnet-evm v0.5.8/go.mod h1:gT3NSswQqopAaJ1UVtB/TiViE6H5Ib684M9FCsy7+D8= -github.com/ava-labs/teleporter v0.0.0-20231107202133-eea4d6312c35 h1:u9ELlYbfHV0oFEKyjggkShy5oE8muSrBTyJOCBT+yKE= -github.com/ava-labs/teleporter v0.0.0-20231107202133-eea4d6312c35/go.mod h1:2f5nUzPKKA670kPMUvNtqu9f2l8RmZLPTOhrarvXJjE= +github.com/ava-labs/avalanchego v1.10.15 h1:GQ1bkwgKnv5D/yUwXUjWPFqx1cWrf35WOaHSykHUXyE= +github.com/ava-labs/avalanchego v1.10.15/go.mod h1:fHTzxKZOMdM0n4EEXDDR0V3Ieb/Jnz7PM8zAsJRsh2U= +github.com/ava-labs/coreth v0.12.8-rc.1 h1:tvJcxQTQzxIQqx8TnrxdyMhZYbdsMaiy6AEiOyjvaa4= +github.com/ava-labs/coreth v0.12.8-rc.1/go.mod h1:GBH5SxHZdScSp95IijDs9+Gxw/QDIWvfoLKiJMNYLsE= +github.com/ava-labs/subnet-evm v0.5.9 h1:IYWj5j83C2oterPOrxOix6/qYCua85HTQ/viMFHNPOM= +github.com/ava-labs/subnet-evm v0.5.9/go.mod h1:n4/abB4BYU1xlAqD15uKz6pRROOh/5u5Jxf4JPK6DbY= +github.com/ava-labs/teleporter v0.0.0-20231109205404-3a226fa468c8 h1:yWi7NoAUuS50bvCA/iS4S640ivZLl10SYdtmNatjqSU= +github.com/ava-labs/teleporter v0.0.0-20231109205404-3a226fa468c8/go.mod h1:wMACx1MEtDhKhDHXXoGAhGNJ0Fy8tRL/y0HvclATSus= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/vms/evm/mocks/mock_eth_client.go b/vms/evm/mocks/mock_eth_client.go index 92fbf1a6..cb30411f 100644 --- a/vms/evm/mocks/mock_eth_client.go +++ b/vms/evm/mocks/mock_eth_client.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: destination_client.go - +// +// Generated by this command: +// +// mockgen -source=destination_client.go -destination=./mocks/mock_eth_client.go -package=mocks +// // Package mocks is a generated GoMock package. package mocks @@ -12,6 +16,7 @@ import ( ids "github.com/ava-labs/avalanchego/ids" types "github.com/ava-labs/subnet-evm/core/types" interfaces "github.com/ava-labs/subnet-evm/interfaces" + rpc "github.com/ava-labs/subnet-evm/rpc" common "github.com/ethereum/go-ethereum/common" gomock "go.uber.org/mock/gomock" ) @@ -49,7 +54,7 @@ func (m *MockClient) AcceptedCallContract(arg0 context.Context, arg1 interfaces. } // AcceptedCallContract indicates an expected call of AcceptedCallContract. -func (mr *MockClientMockRecorder) AcceptedCallContract(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) AcceptedCallContract(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AcceptedCallContract", reflect.TypeOf((*MockClient)(nil).AcceptedCallContract), arg0, arg1) } @@ -64,7 +69,7 @@ func (m *MockClient) AcceptedCodeAt(arg0 context.Context, arg1 common.Address) ( } // AcceptedCodeAt indicates an expected call of AcceptedCodeAt. -func (mr *MockClientMockRecorder) AcceptedCodeAt(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) AcceptedCodeAt(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AcceptedCodeAt", reflect.TypeOf((*MockClient)(nil).AcceptedCodeAt), arg0, arg1) } @@ -79,7 +84,7 @@ func (m *MockClient) AcceptedNonceAt(arg0 context.Context, arg1 common.Address) } // AcceptedNonceAt indicates an expected call of AcceptedNonceAt. -func (mr *MockClientMockRecorder) AcceptedNonceAt(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) AcceptedNonceAt(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AcceptedNonceAt", reflect.TypeOf((*MockClient)(nil).AcceptedNonceAt), arg0, arg1) } @@ -94,7 +99,7 @@ func (m *MockClient) AssetBalanceAt(arg0 context.Context, arg1 common.Address, a } // AssetBalanceAt indicates an expected call of AssetBalanceAt. -func (mr *MockClientMockRecorder) AssetBalanceAt(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) AssetBalanceAt(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AssetBalanceAt", reflect.TypeOf((*MockClient)(nil).AssetBalanceAt), arg0, arg1, arg2, arg3) } @@ -109,7 +114,7 @@ func (m *MockClient) BalanceAt(arg0 context.Context, arg1 common.Address, arg2 * } // BalanceAt indicates an expected call of BalanceAt. -func (mr *MockClientMockRecorder) BalanceAt(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) BalanceAt(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BalanceAt", reflect.TypeOf((*MockClient)(nil).BalanceAt), arg0, arg1, arg2) } @@ -124,7 +129,7 @@ func (m *MockClient) BlockByHash(arg0 context.Context, arg1 common.Hash) (*types } // BlockByHash indicates an expected call of BlockByHash. -func (mr *MockClientMockRecorder) BlockByHash(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) BlockByHash(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BlockByHash", reflect.TypeOf((*MockClient)(nil).BlockByHash), arg0, arg1) } @@ -139,7 +144,7 @@ func (m *MockClient) BlockByNumber(arg0 context.Context, arg1 *big.Int) (*types. } // BlockByNumber indicates an expected call of BlockByNumber. -func (mr *MockClientMockRecorder) BlockByNumber(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) BlockByNumber(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BlockByNumber", reflect.TypeOf((*MockClient)(nil).BlockByNumber), arg0, arg1) } @@ -154,7 +159,7 @@ func (m *MockClient) BlockNumber(arg0 context.Context) (uint64, error) { } // BlockNumber indicates an expected call of BlockNumber. -func (mr *MockClientMockRecorder) BlockNumber(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) BlockNumber(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BlockNumber", reflect.TypeOf((*MockClient)(nil).BlockNumber), arg0) } @@ -169,7 +174,7 @@ func (m *MockClient) CallContract(arg0 context.Context, arg1 interfaces.CallMsg, } // CallContract indicates an expected call of CallContract. -func (mr *MockClientMockRecorder) CallContract(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) CallContract(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CallContract", reflect.TypeOf((*MockClient)(nil).CallContract), arg0, arg1, arg2) } @@ -184,7 +189,7 @@ func (m *MockClient) CallContractAtHash(ctx context.Context, msg interfaces.Call } // CallContractAtHash indicates an expected call of CallContractAtHash. -func (mr *MockClientMockRecorder) CallContractAtHash(ctx, msg, blockHash interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) CallContractAtHash(ctx, msg, blockHash any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CallContractAtHash", reflect.TypeOf((*MockClient)(nil).CallContractAtHash), ctx, msg, blockHash) } @@ -199,11 +204,25 @@ func (m *MockClient) ChainID(arg0 context.Context) (*big.Int, error) { } // ChainID indicates an expected call of ChainID. -func (mr *MockClientMockRecorder) ChainID(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) ChainID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainID", reflect.TypeOf((*MockClient)(nil).ChainID), arg0) } +// Client mocks base method. +func (m *MockClient) Client() *rpc.Client { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Client") + ret0, _ := ret[0].(*rpc.Client) + return ret0 +} + +// Client indicates an expected call of Client. +func (mr *MockClientMockRecorder) Client() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Client", reflect.TypeOf((*MockClient)(nil).Client)) +} + // Close mocks base method. func (m *MockClient) Close() { m.ctrl.T.Helper() @@ -226,7 +245,7 @@ func (m *MockClient) CodeAt(arg0 context.Context, arg1 common.Address, arg2 *big } // CodeAt indicates an expected call of CodeAt. -func (mr *MockClientMockRecorder) CodeAt(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) CodeAt(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CodeAt", reflect.TypeOf((*MockClient)(nil).CodeAt), arg0, arg1, arg2) } @@ -241,7 +260,7 @@ func (m *MockClient) EstimateBaseFee(arg0 context.Context) (*big.Int, error) { } // EstimateBaseFee indicates an expected call of EstimateBaseFee. -func (mr *MockClientMockRecorder) EstimateBaseFee(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) EstimateBaseFee(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EstimateBaseFee", reflect.TypeOf((*MockClient)(nil).EstimateBaseFee), arg0) } @@ -256,7 +275,7 @@ func (m *MockClient) EstimateGas(arg0 context.Context, arg1 interfaces.CallMsg) } // EstimateGas indicates an expected call of EstimateGas. -func (mr *MockClientMockRecorder) EstimateGas(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) EstimateGas(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EstimateGas", reflect.TypeOf((*MockClient)(nil).EstimateGas), arg0, arg1) } @@ -271,7 +290,7 @@ func (m *MockClient) FeeHistory(ctx context.Context, blockCount uint64, lastBloc } // FeeHistory indicates an expected call of FeeHistory. -func (mr *MockClientMockRecorder) FeeHistory(ctx, blockCount, lastBlock, rewardPercentiles interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) FeeHistory(ctx, blockCount, lastBlock, rewardPercentiles any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeeHistory", reflect.TypeOf((*MockClient)(nil).FeeHistory), ctx, blockCount, lastBlock, rewardPercentiles) } @@ -286,7 +305,7 @@ func (m *MockClient) FilterLogs(arg0 context.Context, arg1 interfaces.FilterQuer } // FilterLogs indicates an expected call of FilterLogs. -func (mr *MockClientMockRecorder) FilterLogs(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) FilterLogs(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FilterLogs", reflect.TypeOf((*MockClient)(nil).FilterLogs), arg0, arg1) } @@ -301,7 +320,7 @@ func (m *MockClient) HeaderByHash(arg0 context.Context, arg1 common.Hash) (*type } // HeaderByHash indicates an expected call of HeaderByHash. -func (mr *MockClientMockRecorder) HeaderByHash(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) HeaderByHash(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeaderByHash", reflect.TypeOf((*MockClient)(nil).HeaderByHash), arg0, arg1) } @@ -316,7 +335,7 @@ func (m *MockClient) HeaderByNumber(arg0 context.Context, arg1 *big.Int) (*types } // HeaderByNumber indicates an expected call of HeaderByNumber. -func (mr *MockClientMockRecorder) HeaderByNumber(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) HeaderByNumber(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeaderByNumber", reflect.TypeOf((*MockClient)(nil).HeaderByNumber), arg0, arg1) } @@ -331,7 +350,7 @@ func (m *MockClient) NetworkID(arg0 context.Context) (*big.Int, error) { } // NetworkID indicates an expected call of NetworkID. -func (mr *MockClientMockRecorder) NetworkID(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) NetworkID(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetworkID", reflect.TypeOf((*MockClient)(nil).NetworkID), arg0) } @@ -346,7 +365,7 @@ func (m *MockClient) NonceAt(arg0 context.Context, arg1 common.Address, arg2 *bi } // NonceAt indicates an expected call of NonceAt. -func (mr *MockClientMockRecorder) NonceAt(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) NonceAt(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NonceAt", reflect.TypeOf((*MockClient)(nil).NonceAt), arg0, arg1, arg2) } @@ -360,7 +379,7 @@ func (m *MockClient) SendTransaction(arg0 context.Context, arg1 *types.Transacti } // SendTransaction indicates an expected call of SendTransaction. -func (mr *MockClientMockRecorder) SendTransaction(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SendTransaction(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendTransaction", reflect.TypeOf((*MockClient)(nil).SendTransaction), arg0, arg1) } @@ -375,7 +394,7 @@ func (m *MockClient) StorageAt(arg0 context.Context, arg1 common.Address, arg2 c } // StorageAt indicates an expected call of StorageAt. -func (mr *MockClientMockRecorder) StorageAt(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) StorageAt(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StorageAt", reflect.TypeOf((*MockClient)(nil).StorageAt), arg0, arg1, arg2, arg3) } @@ -390,7 +409,7 @@ func (m *MockClient) SubscribeFilterLogs(arg0 context.Context, arg1 interfaces.F } // SubscribeFilterLogs indicates an expected call of SubscribeFilterLogs. -func (mr *MockClientMockRecorder) SubscribeFilterLogs(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SubscribeFilterLogs(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeFilterLogs", reflect.TypeOf((*MockClient)(nil).SubscribeFilterLogs), arg0, arg1, arg2) } @@ -405,7 +424,7 @@ func (m *MockClient) SubscribeNewAcceptedTransactions(arg0 context.Context, arg1 } // SubscribeNewAcceptedTransactions indicates an expected call of SubscribeNewAcceptedTransactions. -func (mr *MockClientMockRecorder) SubscribeNewAcceptedTransactions(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SubscribeNewAcceptedTransactions(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeNewAcceptedTransactions", reflect.TypeOf((*MockClient)(nil).SubscribeNewAcceptedTransactions), arg0, arg1) } @@ -420,7 +439,7 @@ func (m *MockClient) SubscribeNewHead(arg0 context.Context, arg1 chan<- *types.H } // SubscribeNewHead indicates an expected call of SubscribeNewHead. -func (mr *MockClientMockRecorder) SubscribeNewHead(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SubscribeNewHead(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeNewHead", reflect.TypeOf((*MockClient)(nil).SubscribeNewHead), arg0, arg1) } @@ -435,7 +454,7 @@ func (m *MockClient) SubscribeNewPendingTransactions(arg0 context.Context, arg1 } // SubscribeNewPendingTransactions indicates an expected call of SubscribeNewPendingTransactions. -func (mr *MockClientMockRecorder) SubscribeNewPendingTransactions(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SubscribeNewPendingTransactions(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeNewPendingTransactions", reflect.TypeOf((*MockClient)(nil).SubscribeNewPendingTransactions), arg0, arg1) } @@ -450,7 +469,7 @@ func (m *MockClient) SuggestGasPrice(arg0 context.Context) (*big.Int, error) { } // SuggestGasPrice indicates an expected call of SuggestGasPrice. -func (mr *MockClientMockRecorder) SuggestGasPrice(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SuggestGasPrice(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SuggestGasPrice", reflect.TypeOf((*MockClient)(nil).SuggestGasPrice), arg0) } @@ -465,7 +484,7 @@ func (m *MockClient) SuggestGasTipCap(arg0 context.Context) (*big.Int, error) { } // SuggestGasTipCap indicates an expected call of SuggestGasTipCap. -func (mr *MockClientMockRecorder) SuggestGasTipCap(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SuggestGasTipCap(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SuggestGasTipCap", reflect.TypeOf((*MockClient)(nil).SuggestGasTipCap), arg0) } @@ -479,7 +498,7 @@ func (m *MockClient) SyncProgress(ctx context.Context) error { } // SyncProgress indicates an expected call of SyncProgress. -func (mr *MockClientMockRecorder) SyncProgress(ctx interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SyncProgress(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncProgress", reflect.TypeOf((*MockClient)(nil).SyncProgress), ctx) } @@ -495,7 +514,7 @@ func (m *MockClient) TransactionByHash(arg0 context.Context, arg1 common.Hash) ( } // TransactionByHash indicates an expected call of TransactionByHash. -func (mr *MockClientMockRecorder) TransactionByHash(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) TransactionByHash(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TransactionByHash", reflect.TypeOf((*MockClient)(nil).TransactionByHash), arg0, arg1) } @@ -510,7 +529,7 @@ func (m *MockClient) TransactionCount(arg0 context.Context, arg1 common.Hash) (u } // TransactionCount indicates an expected call of TransactionCount. -func (mr *MockClientMockRecorder) TransactionCount(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) TransactionCount(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TransactionCount", reflect.TypeOf((*MockClient)(nil).TransactionCount), arg0, arg1) } @@ -525,7 +544,7 @@ func (m *MockClient) TransactionInBlock(arg0 context.Context, arg1 common.Hash, } // TransactionInBlock indicates an expected call of TransactionInBlock. -func (mr *MockClientMockRecorder) TransactionInBlock(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) TransactionInBlock(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TransactionInBlock", reflect.TypeOf((*MockClient)(nil).TransactionInBlock), arg0, arg1, arg2) } @@ -540,7 +559,7 @@ func (m *MockClient) TransactionReceipt(arg0 context.Context, arg1 common.Hash) } // TransactionReceipt indicates an expected call of TransactionReceipt. -func (mr *MockClientMockRecorder) TransactionReceipt(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) TransactionReceipt(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TransactionReceipt", reflect.TypeOf((*MockClient)(nil).TransactionReceipt), arg0, arg1) } @@ -555,7 +574,7 @@ func (m *MockClient) TransactionSender(arg0 context.Context, arg1 *types.Transac } // TransactionSender indicates an expected call of TransactionSender. -func (mr *MockClientMockRecorder) TransactionSender(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) TransactionSender(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TransactionSender", reflect.TypeOf((*MockClient)(nil).TransactionSender), arg0, arg1, arg2, arg3) } diff --git a/vms/mocks/mock_destination_client.go b/vms/mocks/mock_destination_client.go index b612cfe7..47e18da0 100644 --- a/vms/mocks/mock_destination_client.go +++ b/vms/mocks/mock_destination_client.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: destination_client.go - +// +// Generated by this command: +// +// mockgen -source=destination_client.go -destination=./mocks/mock_destination_client.go -package=mocks +// // Package mocks is a generated GoMock package. package mocks @@ -37,10 +41,10 @@ func (m *MockDestinationClient) EXPECT() *MockDestinationClientMockRecorder { } // Client mocks base method. -func (m *MockDestinationClient) Client() interface{} { +func (m *MockDestinationClient) Client() any { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Client") - ret0, _ := ret[0].(interface{}) + ret0, _ := ret[0].(any) return ret0 } @@ -73,7 +77,7 @@ func (m *MockDestinationClient) SendTx(signedMessage *warp.Message, toAddress st } // SendTx indicates an expected call of SendTx. -func (mr *MockDestinationClientMockRecorder) SendTx(signedMessage, toAddress, gasLimit, callData interface{}) *gomock.Call { +func (mr *MockDestinationClientMockRecorder) SendTx(signedMessage, toAddress, gasLimit, callData any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendTx", reflect.TypeOf((*MockDestinationClient)(nil).SendTx), signedMessage, toAddress, gasLimit, callData) }