akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

funding test: mark assert methods t.Helper

Browse Source
This commit is contained in:
Johan T. Halseth 2018-09-16 10:40:08 +02:00
parent 9b1ecbd3fa
commit 0db9045e11
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fundingmanager_test.go
View File

@ -672,6 +672,8 @@ func fundChannel(t *testing.T, alice, bob *testNode, localFundingAmt,
} }
func assertErrorNotSent(t *testing.T, msgChan chan lnwire.Message) { func assertErrorNotSent(t *testing.T, msgChan chan lnwire.Message) {
t.Helper()
select { select {
case <-msgChan: case <-msgChan:
t.Fatalf("error sent unexpectedly") t.Fatalf("error sent unexpectedly")
@ -681,6 +683,8 @@ func assertErrorNotSent(t *testing.T, msgChan chan lnwire.Message) {
} }
func assertErrorSent(t *testing.T, msgChan chan lnwire.Message) { func assertErrorSent(t *testing.T, msgChan chan lnwire.Message) {
t.Helper()
var msg lnwire.Message var msg lnwire.Message
select { select {
case msg = <-msgChan: case msg = <-msgChan:
@ -741,6 +745,8 @@ func assertFundingMsgSent(t *testing.T, msgChan chan lnwire.Message,
func assertNumPendingReservations(t *testing.T, node *testNode, func assertNumPendingReservations(t *testing.T, node *testNode,
peerPubKey *btcec.PublicKey, expectedNum int) { peerPubKey *btcec.PublicKey, expectedNum int) {
t.Helper()
serializedPubKey := newSerializedKey(peerPubKey) serializedPubKey := newSerializedKey(peerPubKey)
actualNum := len(node.fundingMgr.activeReservations[serializedPubKey]) actualNum := len(node.fundingMgr.activeReservations[serializedPubKey])
if actualNum == expectedNum { if actualNum == expectedNum {
@ -753,6 +759,8 @@ func assertNumPendingReservations(t *testing.T, node *testNode,
} }
func assertNumPendingChannelsBecomes(t *testing.T, node *testNode, expectedNum int) { func assertNumPendingChannelsBecomes(t *testing.T, node *testNode, expectedNum int) {
t.Helper()
var numPendingChans int var numPendingChans int
for i := 0; i < testPollNumTries; i++ { for i := 0; i < testPollNumTries; i++ {
// If this is not the first try, sleep before retrying. // If this is not the first try, sleep before retrying.
@ -777,6 +785,8 @@ func assertNumPendingChannelsBecomes(t *testing.T, node *testNode, expectedNum i
} }
func assertNumPendingChannelsRemains(t *testing.T, node *testNode, expectedNum int) { func assertNumPendingChannelsRemains(t *testing.T, node *testNode, expectedNum int) {
t.Helper()
var numPendingChans int var numPendingChans int
for i := 0; i < 5; i++ { for i := 0; i < 5; i++ {
// If this is not the first try, sleep before retrying. // If this is not the first try, sleep before retrying.
@ -800,6 +810,7 @@ func assertNumPendingChannelsRemains(t *testing.T, node *testNode, expectedNum i
func assertDatabaseState(t *testing.T, node *testNode, func assertDatabaseState(t *testing.T, node *testNode,
fundingOutPoint *wire.OutPoint, expectedState channelOpeningState) { fundingOutPoint *wire.OutPoint, expectedState channelOpeningState) {
t.Helper()
var state channelOpeningState var state channelOpeningState
var err error var err error
@ -832,18 +843,24 @@ func assertDatabaseState(t *testing.T, node *testNode,
func assertMarkedOpen(t *testing.T, alice, bob *testNode, func assertMarkedOpen(t *testing.T, alice, bob *testNode,
fundingOutPoint *wire.OutPoint) { fundingOutPoint *wire.OutPoint) {
t.Helper()
assertDatabaseState(t, alice, fundingOutPoint, markedOpen) assertDatabaseState(t, alice, fundingOutPoint, markedOpen)
assertDatabaseState(t, bob, fundingOutPoint, markedOpen) assertDatabaseState(t, bob, fundingOutPoint, markedOpen)
} }
func assertFundingLockedSent(t *testing.T, alice, bob *testNode, func assertFundingLockedSent(t *testing.T, alice, bob *testNode,
fundingOutPoint *wire.OutPoint) { fundingOutPoint *wire.OutPoint) {
t.Helper()
assertDatabaseState(t, alice, fundingOutPoint, fundingLockedSent) assertDatabaseState(t, alice, fundingOutPoint, fundingLockedSent)
assertDatabaseState(t, bob, fundingOutPoint, fundingLockedSent) assertDatabaseState(t, bob, fundingOutPoint, fundingLockedSent)
} }
func assertAddedToRouterGraph(t *testing.T, alice, bob *testNode, func assertAddedToRouterGraph(t *testing.T, alice, bob *testNode,
fundingOutPoint *wire.OutPoint) { fundingOutPoint *wire.OutPoint) {
t.Helper()
assertDatabaseState(t, alice, fundingOutPoint, addedToRouterGraph) assertDatabaseState(t, alice, fundingOutPoint, addedToRouterGraph)
assertDatabaseState(t, bob, fundingOutPoint, addedToRouterGraph) assertDatabaseState(t, bob, fundingOutPoint, addedToRouterGraph)
} }
@ -950,6 +967,8 @@ func assertChannelAnnouncements(t *testing.T, alice, bob *testNode,
} }
func assertAnnouncementSignatures(t *testing.T, alice, bob *testNode) { func assertAnnouncementSignatures(t *testing.T, alice, bob *testNode) {
t.Helper()
// After the FundingLocked message is sent and six confirmations have // After the FundingLocked message is sent and six confirmations have
// been reached, the channel will be announced to the greater network // been reached, the channel will be announced to the greater network
// by having the nodes exchange announcement signatures. // by having the nodes exchange announcement signatures.
@ -1006,6 +1025,7 @@ func waitForOpenUpdate(t *testing.T, updateChan chan *lnrpc.OpenStatusUpdate) {
func assertNoChannelState(t *testing.T, alice, bob *testNode, func assertNoChannelState(t *testing.T, alice, bob *testNode,
fundingOutPoint *wire.OutPoint) { fundingOutPoint *wire.OutPoint) {
t.Helper()
assertErrChannelNotFound(t, alice, fundingOutPoint) assertErrChannelNotFound(t, alice, fundingOutPoint)
assertErrChannelNotFound(t, bob, fundingOutPoint) assertErrChannelNotFound(t, bob, fundingOutPoint)
@ -1013,6 +1033,7 @@ func assertNoChannelState(t *testing.T, alice, bob *testNode,
func assertErrChannelNotFound(t *testing.T, node *testNode, func assertErrChannelNotFound(t *testing.T, node *testNode,
fundingOutPoint *wire.OutPoint) { fundingOutPoint *wire.OutPoint) {
t.Helper()
var state channelOpeningState var state channelOpeningState
var err error var err error
@ -1036,6 +1057,8 @@ func assertErrChannelNotFound(t *testing.T, node *testNode,
} }
func assertHandleFundingLocked(t *testing.T, alice, bob *testNode) { func assertHandleFundingLocked(t *testing.T, alice, bob *testNode) {
t.Helper()
// They should both send the new channel state to their peer. // They should both send the new channel state to their peer.
select { select {
case c := <-alice.newChannels: case c := <-alice.newChannels: