From d7b2977e8c7a8718203f7fd754ffce07d9725f28 Mon Sep 17 00:00:00 2001 From: "Johan T. Halseth" Date: Tue, 17 Jul 2018 09:13:06 +0200 Subject: [PATCH] multi test: remove mempool bool from RegisterSpendNtfn --- contractcourt/chain_watcher_test.go | 2 +- discovery/gossiper_test.go | 4 ++-- fundingmanager_test.go | 2 +- htlcswitch/mock.go | 2 +- mock.go | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contractcourt/chain_watcher_test.go b/contractcourt/chain_watcher_test.go index 981fdf2c..a99fcd31 100644 --- a/contractcourt/chain_watcher_test.go +++ b/contractcourt/chain_watcher_test.go @@ -36,7 +36,7 @@ func (m *mockNotifier) Stop() error { return nil } func (m *mockNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint, - heightHint uint32, _ bool) (*chainntnfs.SpendEvent, error) { + heightHint uint32) (*chainntnfs.SpendEvent, error) { return &chainntnfs.SpendEvent{ Spend: m.spendChan, Cancel: func() {}, diff --git a/discovery/gossiper_test.go b/discovery/gossiper_test.go index 9ecf69f5..b3880c08 100644 --- a/discovery/gossiper_test.go +++ b/discovery/gossiper_test.go @@ -263,8 +263,8 @@ func (m *mockNotifier) RegisterConfirmationsNtfn(txid *chainhash.Hash, return nil, nil } -func (m *mockNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint, _ uint32, - _ bool) (*chainntnfs.SpendEvent, error) { +func (m *mockNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint, + _ uint32) (*chainntnfs.SpendEvent, error) { return nil, nil } diff --git a/fundingmanager_test.go b/fundingmanager_test.go index 163b64aa..7550db4c 100644 --- a/fundingmanager_test.go +++ b/fundingmanager_test.go @@ -126,7 +126,7 @@ func (m *mockNotifier) Stop() error { } func (m *mockNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint, - heightHint uint32, _ bool) (*chainntnfs.SpendEvent, error) { + heightHint uint32) (*chainntnfs.SpendEvent, error) { return &chainntnfs.SpendEvent{ Spend: make(chan *chainntnfs.SpendDetail), Cancel: func() {}, diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go index fb648ac2..b3bcbdb1 100644 --- a/htlcswitch/mock.go +++ b/htlcswitch/mock.go @@ -801,7 +801,7 @@ func (m *mockNotifier) Stop() error { } func (m *mockNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint, - heightHint uint32, mempool bool) (*chainntnfs.SpendEvent, error) { + heightHint uint32) (*chainntnfs.SpendEvent, error) { return &chainntnfs.SpendEvent{ Spend: make(chan *chainntnfs.SpendDetail), diff --git a/mock.go b/mock.go index 405eaea0..e7b41828 100644 --- a/mock.go +++ b/mock.go @@ -106,7 +106,7 @@ func (m *mockNotfier) Stop() error { return nil } func (m *mockNotfier) RegisterSpendNtfn(outpoint *wire.OutPoint, - heightHint uint32, _ bool) (*chainntnfs.SpendEvent, error) { + heightHint uint32) (*chainntnfs.SpendEvent, error) { return &chainntnfs.SpendEvent{ Spend: make(chan *chainntnfs.SpendDetail), Cancel: func() {}, @@ -131,7 +131,7 @@ func makeMockSpendNotifier() *mockSpendNotifier { } func (m *mockSpendNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint, - heightHint uint32, _ bool) (*chainntnfs.SpendEvent, error) { + heightHint uint32) (*chainntnfs.SpendEvent, error) { m.mtx.Lock() defer m.mtx.Unlock()