fundingmanager_test: remove ArbiterChan
This commit is contained in:
parent
cdf60b5f9d
commit
7c945b42fe
@ -136,7 +136,6 @@ type testNode struct {
|
||||
privKey *btcec.PrivateKey
|
||||
msgChan chan lnwire.Message
|
||||
announceChan chan lnwire.Message
|
||||
arbiterChan chan wire.OutPoint
|
||||
publTxChan chan *wire.MsgTx
|
||||
fundingMgr *fundingManager
|
||||
peer *peer
|
||||
@ -200,7 +199,6 @@ func createTestFundingManager(t *testing.T, privKey *btcec.PrivateKey,
|
||||
sentMessages := make(chan lnwire.Message)
|
||||
sentAnnouncements := make(chan lnwire.Message)
|
||||
publTxChan := make(chan *wire.MsgTx, 1)
|
||||
arbiterChan := make(chan wire.OutPoint)
|
||||
shutdownChan := make(chan struct{})
|
||||
|
||||
wc := &mockWalletController{
|
||||
@ -306,7 +304,6 @@ func createTestFundingManager(t *testing.T, privKey *btcec.PrivateKey,
|
||||
RequiredRemoteMaxHTLCs: func(chanAmt btcutil.Amount) uint16 {
|
||||
return uint16(lnwallet.MaxHTLCNumber / 2)
|
||||
},
|
||||
ArbiterChan: arbiterChan,
|
||||
WatchNewChannel: func(*channeldb.OpenChannel, *lnwire.NetAddress) error {
|
||||
return nil
|
||||
},
|
||||
@ -328,7 +325,6 @@ func createTestFundingManager(t *testing.T, privKey *btcec.PrivateKey,
|
||||
privKey: privKey,
|
||||
msgChan: sentMessages,
|
||||
announceChan: sentAnnouncements,
|
||||
arbiterChan: arbiterChan,
|
||||
publTxChan: publTxChan,
|
||||
fundingMgr: f,
|
||||
peer: p,
|
||||
@ -386,7 +382,6 @@ func recreateAliceFundingManager(t *testing.T, alice *testNode) {
|
||||
},
|
||||
FindPeer: oldCfg.FindPeer,
|
||||
TempChanIDSeed: oldCfg.TempChanIDSeed,
|
||||
ArbiterChan: alice.arbiterChan,
|
||||
FindChannel: oldCfg.FindChannel,
|
||||
PublishTransaction: func(txn *wire.MsgTx) error {
|
||||
publishChan <- txn
|
||||
@ -857,20 +852,7 @@ func assertErrChannelNotFound(t *testing.T, node *testNode,
|
||||
}
|
||||
|
||||
func assertHandleFundingLocked(t *testing.T, alice, bob *testNode) {
|
||||
// They should both send the new channel to the breach arbiter.
|
||||
select {
|
||||
case <-alice.arbiterChan:
|
||||
case <-time.After(time.Second * 15):
|
||||
t.Fatalf("alice did not send channel to breach arbiter")
|
||||
}
|
||||
|
||||
select {
|
||||
case <-bob.arbiterChan:
|
||||
case <-time.After(time.Second * 15):
|
||||
t.Fatalf("bob did not send channel to breach arbiter")
|
||||
}
|
||||
|
||||
// And send the new channel state to their peer.
|
||||
// They should both send the new channel state to their peer.
|
||||
select {
|
||||
case c := <-alice.peer.newChannels:
|
||||
close(c.done)
|
||||
@ -1587,12 +1569,6 @@ func TestFundingManagerReceiveFundingLockedTwice(t *testing.T) {
|
||||
// Alice should not send the channel state the second time, as the
|
||||
// second funding locked should just be ignored.
|
||||
select {
|
||||
case <-alice.arbiterChan:
|
||||
t.Fatalf("alice sent channel to breach arbiter a second time")
|
||||
case <-time.After(time.Millisecond * 300):
|
||||
// Expected
|
||||
}
|
||||
select {
|
||||
case <-alice.peer.newChannels:
|
||||
t.Fatalf("alice sent new channel to peer a second time")
|
||||
case <-time.After(time.Millisecond * 300):
|
||||
@ -1603,12 +1579,6 @@ func TestFundingManagerReceiveFundingLockedTwice(t *testing.T) {
|
||||
// have updated her database at this point.
|
||||
alice.fundingMgr.processFundingLocked(fundingLockedBob, bobAddr)
|
||||
select {
|
||||
case <-alice.arbiterChan:
|
||||
t.Fatalf("alice sent channel to breach arbiter a second time")
|
||||
case <-time.After(time.Millisecond * 300):
|
||||
// Expected
|
||||
}
|
||||
select {
|
||||
case <-alice.peer.newChannels:
|
||||
t.Fatalf("alice sent new channel to peer a second time")
|
||||
case <-time.After(time.Millisecond * 300):
|
||||
|
Loading…
Reference in New Issue
Block a user