From 6a709526d8999817ee2ea963b0bc5937e9a89490 Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Thu, 2 Aug 2018 02:14:55 -0700 Subject: [PATCH] htlcswitch/mock: remove mockTicker, use ticker.MockNew --- htlcswitch/mock.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go index 9d3a2938..20472b6a 100644 --- a/htlcswitch/mock.go +++ b/htlcswitch/mock.go @@ -26,6 +26,7 @@ import ( "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" + "github.com/lightningnetwork/lnd/ticker" ) type mockPreimageCache struct { @@ -143,7 +144,9 @@ func initSwitchWithDB(startingHeight uint32, db *channeldb.DB) (*Switch, error) FetchLastChannelUpdate: func(lnwire.ShortChannelID) (*lnwire.ChannelUpdate, error) { return nil, nil }, - Notifier: &mockNotifier{}, + Notifier: &mockNotifier{}, + FwdEventTicker: ticker.MockNew(DefaultFwdEventInterval), + LogEventTicker: ticker.MockNew(DefaultLogInterval), } return New(cfg, startingHeight) @@ -807,14 +810,3 @@ func (m *mockNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint, _ []byte, Spend: make(chan *chainntnfs.SpendDetail), }, nil } - -type mockTicker struct { - ticker <-chan time.Time -} - -func (m *mockTicker) Start() <-chan time.Time { - return m.ticker -} - -func (m *mockTicker) Stop() { -}