From fbdf8b098e5cbb1397b7d4052a89d6f761841db0 Mon Sep 17 00:00:00 2001 From: Marko Date: Wed, 26 Aug 2020 17:28:46 +0200 Subject: [PATCH] mocks: update with 2.2.1 (#5294) ## Description When downloading mockery I ran into an issue where we were using the old version. This PR updates to a more recent version. changelog? Closes: #XXX --- evidence/mocks/block_store.go | 2 +- p2p/mocks/peer.go | 2 +- p2p/peer.go | 2 +- proxy/app_conn.go | 2 +- proxy/mocks/app_conn_consensus.go | 2 +- proxy/mocks/app_conn_mempool.go | 25 ++++++++++++++++++++++++- proxy/mocks/app_conn_query.go | 2 +- proxy/mocks/app_conn_snapshot.go | 2 +- state/mocks/evidence_pool.go | 2 +- statesync/mocks/state_provider.go | 2 +- statesync/stateprovider.go | 2 +- 11 files changed, 34 insertions(+), 11 deletions(-) diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go index 0b1fa334f..84c695844 100644 --- a/evidence/mocks/block_store.go +++ b/evidence/mocks/block_store.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.2.1. DO NOT EDIT. package mocks diff --git a/p2p/mocks/peer.go b/p2p/mocks/peer.go index f874e0405..3231916d7 100644 --- a/p2p/mocks/peer.go +++ b/p2p/mocks/peer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.2.1. DO NOT EDIT. package mocks diff --git a/p2p/peer.go b/p2p/peer.go index ce05fcf61..4fdb4ee57 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -12,7 +12,7 @@ import ( tmconn "github.com/tendermint/tendermint/p2p/conn" ) -//go:generate mockery -case underscore -name Peer +//go:generate mockery --case underscore --name Peer const metricsTickerDuration = 10 * time.Second diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 376c19342..720007ed1 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/tendermint/abci/types" ) -//go:generate mockery -case underscore -name AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot +//go:generate mockery --case underscore --name AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot //---------------------------------------------------------------------------------------- // Enforce which abci msgs can be sent on a connection at the type level diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go index 3727c372f..618f124a0 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.2.1. DO NOT EDIT. package mocks diff --git a/proxy/mocks/app_conn_mempool.go b/proxy/mocks/app_conn_mempool.go index e98fbe465..2f9ea0937 100644 --- a/proxy/mocks/app_conn_mempool.go +++ b/proxy/mocks/app_conn_mempool.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.2.1. DO NOT EDIT. package mocks @@ -30,6 +30,29 @@ func (_m *AppConnMempool) CheckTxAsync(_a0 types.RequestCheckTx) *abcicli.ReqRes return r0 } +// CheckTxSync provides a mock function with given fields: _a0 +func (_m *AppConnMempool) CheckTxSync(_a0 types.RequestCheckTx) (*types.ResponseCheckTx, error) { + ret := _m.Called(_a0) + + var r0 *types.ResponseCheckTx + if rf, ok := ret.Get(0).(func(types.RequestCheckTx) *types.ResponseCheckTx); ok { + r0 = rf(_a0) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseCheckTx) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(types.RequestCheckTx) error); ok { + r1 = rf(_a0) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // Error provides a mock function with given fields: func (_m *AppConnMempool) Error() error { ret := _m.Called() diff --git a/proxy/mocks/app_conn_query.go b/proxy/mocks/app_conn_query.go index 5274a72b9..da10689a3 100644 --- a/proxy/mocks/app_conn_query.go +++ b/proxy/mocks/app_conn_query.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.2.1. DO NOT EDIT. package mocks diff --git a/proxy/mocks/app_conn_snapshot.go b/proxy/mocks/app_conn_snapshot.go index e5ad235cf..8f4523e67 100644 --- a/proxy/mocks/app_conn_snapshot.go +++ b/proxy/mocks/app_conn_snapshot.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.2.1. DO NOT EDIT. package mocks diff --git a/state/mocks/evidence_pool.go b/state/mocks/evidence_pool.go index fe271c0f0..fc7d140e0 100644 --- a/state/mocks/evidence_pool.go +++ b/state/mocks/evidence_pool.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.2.1. DO NOT EDIT. package mocks diff --git a/statesync/mocks/state_provider.go b/statesync/mocks/state_provider.go index 0a71aae68..6ffd1f0a9 100644 --- a/statesync/mocks/state_provider.go +++ b/statesync/mocks/state_provider.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. +// Code generated by mockery v2.2.1. DO NOT EDIT. package mocks diff --git a/statesync/stateprovider.go b/statesync/stateprovider.go index 3ed41c815..6150484e0 100644 --- a/statesync/stateprovider.go +++ b/statesync/stateprovider.go @@ -20,7 +20,7 @@ import ( "github.com/tendermint/tendermint/types" ) -//go:generate mockery -case underscore -name StateProvider +//go:generate mockery --case underscore --name StateProvider // StateProvider is a provider of trusted state data for bootstrapping a node. This refers // to the state.State object, not the state machine.