aljaz/lspd
1
0
Fork 0
mirror of https://github.com/aljazceru/lspd.git synced 2025-12-19 06:44:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename shared package to common

Browse Source
This commit is contained in:
Jesse de Wit
2023-10-26 14:39:03 +02:00
parent fb3b051d02
commit 3cf4b714a9
22 changed files with 251 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
lsps2/intercept_test.go
View File

@@ -11,9 +11,9 @@ import (
"time"
"github.com/breez/lspd/chain"
"github.com/breez/lspd/common"
"github.com/breez/lspd/lightning"
"github.com/breez/lspd/lsps0"
"github.com/breez/lspd/shared"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/stretchr/testify/assert"
@@ -36,8 +36,8 @@ var defaultChanResult = &lightning.GetChannelResult{
ConfirmedChannelID: lightning.ShortChannelID(defaultChannelScid),
}
func defaultOpeningFeeParams() shared.OpeningFeeParams {
return shared.OpeningFeeParams{
func defaultOpeningFeeParams() common.OpeningFeeParams {
return common.OpeningFeeParams{
MinFeeMsat: 1000,
Proportional: 1000,
ValidUntil: time.Now().UTC().Add(5 * time.Hour).Format(lsps0.TIME_FORMAT),
@@ -163,7 +163,7 @@ type part struct {
cltvDelta uint32
}
func createPart(p *part) shared.InterceptRequest {
func createPart(p *part) common.InterceptRequest {
id := "first"
if p != nil && p.id != "" {
id = p.id
@@ -189,7 +189,7 @@ func createPart(p *part) shared.InterceptRequest {
cltv = p.cltvDelta
}
return shared.InterceptRequest{
return common.InterceptRequest{
Identifier: id,
Scid: scid,
PaymentHash: ph,
@@ -200,7 +200,7 @@ func createPart(p *part) shared.InterceptRequest {
}
}
func runIntercept(i *Interceptor, req shared.InterceptRequest, res *shared.InterceptResult, wg *sync.WaitGroup) {
func runIntercept(i *Interceptor, req common.InterceptRequest, res *common.InterceptResult, wg *sync.WaitGroup) {
go func() {
*res = i.Intercept(req)
wg.Done()
@@ -224,7 +224,7 @@ func Test_NotBought_SinglePart(t *testing.T) {
defer cancel()
i := setupInterceptor(ctx, nil)
res := i.Intercept(createPart(&part{scid: 999}))
assert.Equal(t, shared.INTERCEPT_RESUME, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME, res.Action)
assertEmpty(t, i)
}
@@ -235,14 +235,14 @@ func Test_NotBought_TwoParts(t *testing.T) {
var wg sync.WaitGroup
wg.Add(2)
var res1 shared.InterceptResult
var res1 common.InterceptResult
runIntercept(i, createPart(&part{id: "first", scid: 999}), &res1, &wg)
var res2 shared.InterceptResult
var res2 common.InterceptResult
runIntercept(i, createPart(&part{id: "second", scid: 999}), &res2, &wg)
wg.Wait()
assert.Equal(t, shared.INTERCEPT_RESUME, res1.Action)
assert.Equal(t, shared.INTERCEPT_RESUME, res2.Action)
assert.Equal(t, common.INTERCEPT_RESUME, res1.Action)
assert.Equal(t, common.INTERCEPT_RESUME, res2.Action)
assertEmpty(t, i)
}
@@ -253,7 +253,7 @@ func Test_NoMpp_Happyflow(t *testing.T) {
i := setupInterceptor(ctx, nil)
res := i.Intercept(createPart(nil))
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, defaultPaymentSizeMsat-defaultFee, res.AmountMsat)
assert.Equal(t, defaultFee, *res.FeeMsat)
assert.Equal(t, defaultChannelScid, uint64(res.Scid))
@@ -268,7 +268,7 @@ func Test_NoMpp_AmountMinFeePlusHtlcMinPlusOne(t *testing.T) {
i := setupInterceptor(ctx, nil)
res := i.Intercept(createPart(&part{amt: defaultMinViableAmount}))
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, defaultConfig().HtlcMinimumMsat, res.AmountMsat)
assert.Equal(t, defaultOpeningFeeParams().MinFeeMsat, *res.FeeMsat)
assert.Equal(t, defaultChannelScid, uint64(res.Scid))
@@ -283,8 +283,8 @@ func Test_NoMpp_AmtBelowMinimum(t *testing.T) {
i := setupInterceptor(ctx, nil)
res := i.Intercept(createPart(&part{amt: defaultMinViableAmount - 1}))
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, shared.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, common.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assertEmpty(t, i)
}
@@ -296,7 +296,7 @@ func Test_NoMpp_AmtAtMaximum(t *testing.T) {
i := setupInterceptor(ctx, nil)
res := i.Intercept(createPart(&part{amt: defaultConfig().MaxPaymentSizeMsat}))
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res.Action)
assertEmpty(t, i)
}
@@ -308,8 +308,8 @@ func Test_NoMpp_AmtAboveMaximum(t *testing.T) {
i := setupInterceptor(ctx, nil)
res := i.Intercept(createPart(&part{amt: defaultConfig().MaxPaymentSizeMsat + 1}))
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, shared.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, common.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assertEmpty(t, i)
}
@@ -321,8 +321,8 @@ func Test_NoMpp_CltvDeltaBelowMinimum(t *testing.T) {
i := setupInterceptor(ctx, nil)
res := i.Intercept(createPart(&part{cltvDelta: 145}))
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, shared.FAILURE_INCORRECT_CLTV_EXPIRY, res.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, common.FAILURE_INCORRECT_CLTV_EXPIRY, res.FailureCode)
assertEmpty(t, i)
}
@@ -334,7 +334,7 @@ func Test_NoMpp_HigherCltvDelta(t *testing.T) {
i := setupInterceptor(ctx, nil)
res := i.Intercept(createPart(&part{cltvDelta: 1000}))
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res.Action)
assertEmpty(t, i)
}
@@ -349,8 +349,8 @@ func Test_NoMpp_ParamsExpired(t *testing.T) {
i := setupInterceptor(ctx, &interceptP{store: store})
res := i.Intercept(createPart(nil))
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, shared.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, common.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assertEmpty(t, i)
}
@@ -362,7 +362,7 @@ func Test_NoMpp_ChannelAlreadyOpened_NotComplete_Forwards(t *testing.T) {
i := setupInterceptor(ctx, &interceptP{store: store})
res := i.Intercept(createPart(nil))
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res.Action)
assertEmpty(t, i)
}
@@ -375,8 +375,8 @@ func Test_NoMpp_ChannelAlreadyOpened_Complete_Fails(t *testing.T) {
i := setupInterceptor(ctx, &interceptP{store: store})
res := i.Intercept(createPart(nil))
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, shared.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, common.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assertEmpty(t, i)
}
@@ -388,7 +388,7 @@ func Test_Mpp_SinglePart_Happyflow(t *testing.T) {
i := setupInterceptor(ctx, &interceptP{store: mppStore()})
res := i.Intercept(createPart(&part{amt: defaultPaymentSizeMsat}))
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, defaultPaymentSizeMsat-defaultFee, res.AmountMsat)
assert.Equal(t, defaultFee, *res.FeeMsat)
assert.Equal(t, defaultChannelScid, uint64(res.Scid))
@@ -407,8 +407,8 @@ func Test_Mpp_SinglePart_AmtTooSmall(t *testing.T) {
start := time.Now()
res := i.Intercept(createPart(&part{amt: defaultPaymentSizeMsat - 1}))
end := time.Now()
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, shared.FAILURE_TEMPORARY_CHANNEL_FAILURE, res.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, common.FAILURE_TEMPORARY_CHANNEL_FAILURE, res.FailureCode)
assert.GreaterOrEqual(t, end.Sub(start).Milliseconds(), config.MppTimeout.Milliseconds())
assertEmpty(t, i)
}
@@ -425,8 +425,8 @@ func Test_Mpp_TwoParts_FinalizedOnSecond(t *testing.T) {
var wg sync.WaitGroup
wg.Add(2)
var res1 shared.InterceptResult
var res2 shared.InterceptResult
var res1 common.InterceptResult
var res2 common.InterceptResult
var t1 time.Time
var t2 time.Time
start := time.Now()
@@ -451,11 +451,11 @@ func Test_Mpp_TwoParts_FinalizedOnSecond(t *testing.T) {
}()
wg.Wait()
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res1.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res1.Action)
assert.Equal(t, defaultPaymentSizeMsat-defaultConfig().HtlcMinimumMsat-defaultFee, res1.AmountMsat)
assert.Equal(t, defaultFee, *res1.FeeMsat)
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res2.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res2.Action)
assert.Equal(t, defaultConfig().HtlcMinimumMsat, res2.AmountMsat)
assert.Nil(t, res2.FeeMsat)
@@ -480,9 +480,9 @@ func Test_Mpp_BadSecondPart_ThirdPartCompletes(t *testing.T) {
var wg sync.WaitGroup
wg.Add(2)
var res1 shared.InterceptResult
var res2 shared.InterceptResult
var res3 shared.InterceptResult
var res1 common.InterceptResult
var res2 common.InterceptResult
var res3 common.InterceptResult
var t1 time.Time
var t2 time.Time
var t3 time.Time
@@ -514,14 +514,14 @@ func Test_Mpp_BadSecondPart_ThirdPartCompletes(t *testing.T) {
}()
wg.Wait()
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res1.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res1.Action)
assert.Equal(t, defaultPaymentSizeMsat-defaultConfig().HtlcMinimumMsat-defaultFee, res1.AmountMsat)
assert.Equal(t, defaultFee, *res1.FeeMsat)
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res2.Action)
assert.Equal(t, shared.FAILURE_AMOUNT_BELOW_MINIMUM, res2.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res2.Action)
assert.Equal(t, common.FAILURE_AMOUNT_BELOW_MINIMUM, res2.FailureCode)
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res3.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res3.Action)
assert.Equal(t, defaultConfig().HtlcMinimumMsat, res3.AmountMsat)
assert.Nil(t, res3.FeeMsat)
@@ -540,8 +540,8 @@ func Test_Mpp_CltvDeltaBelowMinimum(t *testing.T) {
i := setupInterceptor(ctx, &interceptP{store: mppStore()})
res := i.Intercept(createPart(&part{cltvDelta: 145}))
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, shared.FAILURE_INCORRECT_CLTV_EXPIRY, res.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, common.FAILURE_INCORRECT_CLTV_EXPIRY, res.FailureCode)
assertEmpty(t, i)
}
@@ -553,7 +553,7 @@ func Test_Mpp_HigherCltvDelta(t *testing.T) {
i := setupInterceptor(ctx, &interceptP{store: mppStore()})
res := i.Intercept(createPart(&part{cltvDelta: 1000}))
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res.Action)
assertEmpty(t, i)
}
@@ -568,8 +568,8 @@ func Test_Mpp_ParamsExpired(t *testing.T) {
i := setupInterceptor(ctx, &interceptP{store: store})
res := i.Intercept(createPart(nil))
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, shared.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, common.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assertEmpty(t, i)
}
@@ -585,8 +585,8 @@ func Test_Mpp_ParamsExpireInFlight(t *testing.T) {
store.registrations[defaultScid].OpeningFeeParams.ValidUntil = start.
UTC().Add(time.Millisecond * 250).Format(lsps0.TIME_FORMAT)
var res1 shared.InterceptResult
var res2 shared.InterceptResult
var res1 common.InterceptResult
var res2 common.InterceptResult
var wg sync.WaitGroup
wg.Add(1)
go func() {
@@ -604,10 +604,10 @@ func Test_Mpp_ParamsExpireInFlight(t *testing.T) {
}))
wg.Wait()
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res1.Action)
assert.Equal(t, shared.FAILURE_UNKNOWN_NEXT_PEER, res1.FailureCode)
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res2.Action)
assert.Equal(t, shared.FAILURE_UNKNOWN_NEXT_PEER, res2.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res1.Action)
assert.Equal(t, common.FAILURE_UNKNOWN_NEXT_PEER, res1.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res2.Action)
assert.Equal(t, common.FAILURE_UNKNOWN_NEXT_PEER, res2.FailureCode)
assertEmpty(t, i)
}
@@ -622,9 +622,9 @@ func Test_Mpp_PartReplacement(t *testing.T) {
var wg sync.WaitGroup
wg.Add(3)
var res1 shared.InterceptResult
var res2 shared.InterceptResult
var res3 shared.InterceptResult
var res1 common.InterceptResult
var res2 common.InterceptResult
var res3 common.InterceptResult
var t1 time.Time
var t2 time.Time
var t3 time.Time
@@ -659,13 +659,13 @@ func Test_Mpp_PartReplacement(t *testing.T) {
}()
wg.Wait()
assert.Equal(t, shared.INTERCEPT_IGNORE, res1.Action)
assert.Equal(t, common.INTERCEPT_IGNORE, res1.Action)
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res2.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res2.Action)
assert.Equal(t, defaultPaymentSizeMsat-defaultConfig().HtlcMinimumMsat-defaultFee, res2.AmountMsat)
assert.Equal(t, defaultFee, *res2.FeeMsat)
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res3.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res3.Action)
assert.Equal(t, defaultConfig().HtlcMinimumMsat, res3.AmountMsat)
assert.Nil(t, res3.FeeMsat)
@@ -684,7 +684,7 @@ func Test_Mpp_ChannelAlreadyOpened_NotComplete_Forwards(t *testing.T) {
i := setupInterceptor(ctx, &interceptP{store: store})
res := i.Intercept(createPart(nil))
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res.Action)
assertEmpty(t, i)
}
@@ -697,8 +697,8 @@ func Test_Mpp_ChannelAlreadyOpened_Complete_Fails(t *testing.T) {
i := setupInterceptor(ctx, &interceptP{store: store})
res := i.Intercept(createPart(nil))
assert.Equal(t, shared.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, shared.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
assert.Equal(t, common.FAILURE_UNKNOWN_NEXT_PEER, res.FailureCode)
assertEmpty(t, i)
}
@@ -745,7 +745,7 @@ func Test_Mpp_Performance(t *testing.T) {
amt: defaultPaymentSizeMsat / uint64(partCount),
}))
assert.Equal(t, shared.INTERCEPT_RESUME_WITH_ONION, res.Action)
assert.Equal(t, common.INTERCEPT_RESUME_WITH_ONION, res.Action)
wg.Done()
}()
}