From fbfc9a53af111c86017600f63cc011f886b35f9c Mon Sep 17 00:00:00 2001 From: "Johan T. Halseth" Date: Wed, 19 Dec 2018 14:54:53 +0100 Subject: [PATCH] autopilot: TestConstrainedPrefAttachmentNeedMoreChan->TestConstraintsChannelBudget Since the constraints are no longer something the heuristic needs to be aware of, we move the test. --- autopilot/agent_constraints_test.go | 166 ++++++++++++++++++++++++++++ autopilot/prefattach_test.go | 162 --------------------------- 2 files changed, 166 insertions(+), 162 deletions(-) create mode 100644 autopilot/agent_constraints_test.go diff --git a/autopilot/agent_constraints_test.go b/autopilot/agent_constraints_test.go new file mode 100644 index 00000000..4ce78245 --- /dev/null +++ b/autopilot/agent_constraints_test.go @@ -0,0 +1,166 @@ +package autopilot + +import ( + "testing" + "time" + + prand "math/rand" + + "github.com/btcsuite/btcutil" + "github.com/lightningnetwork/lnd/lnwire" +) + +func TestConstraintsChannelBudget(t *testing.T) { + t.Parallel() + + prand.Seed(time.Now().Unix()) + + const ( + minChanSize = 0 + maxChanSize = btcutil.Amount(btcutil.SatoshiPerBitcoin) + + chanLimit = 3 + + threshold = 0.5 + ) + + constraints := NewConstraints( + minChanSize, + maxChanSize, + chanLimit, + 0, + threshold, + ) + + randChanID := func() lnwire.ShortChannelID { + return lnwire.NewShortChanIDFromInt(uint64(prand.Int63())) + } + + testCases := []struct { + channels []Channel + walletAmt btcutil.Amount + + needMore bool + amtAvailable btcutil.Amount + numMore uint32 + }{ + // Many available funds, but already have too many active open + // channels. + { + []Channel{ + { + ChanID: randChanID(), + Capacity: btcutil.Amount(prand.Int31()), + }, + { + ChanID: randChanID(), + Capacity: btcutil.Amount(prand.Int31()), + }, + { + ChanID: randChanID(), + Capacity: btcutil.Amount(prand.Int31()), + }, + }, + btcutil.Amount(btcutil.SatoshiPerBitcoin * 10), + false, + 0, + 0, + }, + + // Ratio of funds in channels and total funds meets the + // threshold. + { + []Channel{ + { + ChanID: randChanID(), + Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), + }, + { + ChanID: randChanID(), + Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), + }, + }, + btcutil.Amount(btcutil.SatoshiPerBitcoin * 2), + false, + 0, + 0, + }, + + // Ratio of funds in channels and total funds is below the + // threshold. We have 10 BTC allocated amongst channels and + // funds, atm. We're targeting 50%, so 5 BTC should be + // allocated. Only 1 BTC is atm, so 4 BTC should be + // recommended. We should also request 2 more channels as the + // limit is 3. + { + []Channel{ + { + ChanID: randChanID(), + Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), + }, + }, + btcutil.Amount(btcutil.SatoshiPerBitcoin * 9), + true, + btcutil.Amount(btcutil.SatoshiPerBitcoin * 4), + 2, + }, + + // Ratio of funds in channels and total funds is below the + // threshold. We have 14 BTC total amongst the wallet's + // balance, and our currently opened channels. Since we're + // targeting a 50% allocation, we should commit 7 BTC. The + // current channels commit 4 BTC, so we should expected 3 BTC + // to be committed. We should only request a single additional + // channel as the limit is 3. + { + []Channel{ + { + ChanID: randChanID(), + Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), + }, + { + ChanID: randChanID(), + Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin * 3), + }, + }, + btcutil.Amount(btcutil.SatoshiPerBitcoin * 10), + true, + btcutil.Amount(btcutil.SatoshiPerBitcoin * 3), + 1, + }, + + // Ratio of funds in channels and total funds is above the + // threshold. + { + []Channel{ + { + ChanID: randChanID(), + Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), + }, + { + ChanID: randChanID(), + Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), + }, + }, + btcutil.Amount(btcutil.SatoshiPerBitcoin), + false, + 0, + 0, + }, + } + + for i, testCase := range testCases { + amtToAllocate, numMore := constraints.ChannelBudget( + testCase.channels, testCase.walletAmt, + ) + + if amtToAllocate != testCase.amtAvailable { + t.Fatalf("test #%v: expected %v, got %v", + i, testCase.amtAvailable, amtToAllocate) + } + if numMore != testCase.numMore { + t.Fatalf("test #%v: expected %v, got %v", + i, testCase.numMore, numMore) + } + } +} diff --git a/autopilot/prefattach_test.go b/autopilot/prefattach_test.go index 0fbf68e3..94d02123 100644 --- a/autopilot/prefattach_test.go +++ b/autopilot/prefattach_test.go @@ -12,170 +12,8 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/lnwire" ) -func TestConstrainedPrefAttachmentNeedMoreChan(t *testing.T) { - t.Parallel() - - prand.Seed(time.Now().Unix()) - - const ( - minChanSize = 0 - maxChanSize = btcutil.Amount(btcutil.SatoshiPerBitcoin) - - chanLimit = 3 - - threshold = 0.5 - ) - - constraints := NewConstraints( - minChanSize, - maxChanSize, - chanLimit, - 0, - threshold, - ) - - randChanID := func() lnwire.ShortChannelID { - return lnwire.NewShortChanIDFromInt(uint64(prand.Int63())) - } - - testCases := []struct { - channels []Channel - walletAmt btcutil.Amount - - needMore bool - amtAvailable btcutil.Amount - numMore uint32 - }{ - // Many available funds, but already have too many active open - // channels. - { - []Channel{ - { - ChanID: randChanID(), - Capacity: btcutil.Amount(prand.Int31()), - }, - { - ChanID: randChanID(), - Capacity: btcutil.Amount(prand.Int31()), - }, - { - ChanID: randChanID(), - Capacity: btcutil.Amount(prand.Int31()), - }, - }, - btcutil.Amount(btcutil.SatoshiPerBitcoin * 10), - false, - 0, - 0, - }, - - // Ratio of funds in channels and total funds meets the - // threshold. - { - []Channel{ - { - ChanID: randChanID(), - Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), - }, - { - ChanID: randChanID(), - Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), - }, - }, - btcutil.Amount(btcutil.SatoshiPerBitcoin * 2), - false, - 0, - 0, - }, - - // Ratio of funds in channels and total funds is below the - // threshold. We have 10 BTC allocated amongst channels and - // funds, atm. We're targeting 50%, so 5 BTC should be - // allocated. Only 1 BTC is atm, so 4 BTC should be - // recommended. We should also request 2 more channels as the - // limit is 3. - { - []Channel{ - { - ChanID: randChanID(), - Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), - }, - }, - btcutil.Amount(btcutil.SatoshiPerBitcoin * 9), - true, - btcutil.Amount(btcutil.SatoshiPerBitcoin * 4), - 2, - }, - - // Ratio of funds in channels and total funds is below the - // threshold. We have 14 BTC total amongst the wallet's - // balance, and our currently opened channels. Since we're - // targeting a 50% allocation, we should commit 7 BTC. The - // current channels commit 4 BTC, so we should expected 3 BTC - // to be committed. We should only request a single additional - // channel as the limit is 3. - { - []Channel{ - { - ChanID: randChanID(), - Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), - }, - { - ChanID: randChanID(), - Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin * 3), - }, - }, - btcutil.Amount(btcutil.SatoshiPerBitcoin * 10), - true, - btcutil.Amount(btcutil.SatoshiPerBitcoin * 3), - 1, - }, - - // Ratio of funds in channels and total funds is above the - // threshold. - { - []Channel{ - { - ChanID: randChanID(), - Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), - }, - { - ChanID: randChanID(), - Capacity: btcutil.Amount(btcutil.SatoshiPerBitcoin), - }, - }, - btcutil.Amount(btcutil.SatoshiPerBitcoin), - false, - 0, - 0, - }, - } - - prefAttach := NewConstrainedPrefAttachment(constraints) - - for i, testCase := range testCases { - amtToAllocate, numMore, needMore := prefAttach.NeedMoreChans( - testCase.channels, testCase.walletAmt, - ) - - if amtToAllocate != testCase.amtAvailable { - t.Fatalf("test #%v: expected %v, got %v", - i, testCase.amtAvailable, amtToAllocate) - } - if needMore != testCase.needMore { - t.Fatalf("test #%v: expected %v, got %v", - i, testCase.needMore, needMore) - } - if numMore != testCase.numMore { - t.Fatalf("test #%v: expected %v, got %v", - i, testCase.numMore, numMore) - } - } -} - type genGraphFunc func() (testGraph, func(), error) type testGraph interface {