cleanup: move outpoint to basetypes package

This commit is contained in:
Jesse de Wit
2023-03-24 14:40:59 +01:00
parent c3c721a6d2
commit f81037298f
4 changed files with 5 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
package main
package basetypes
import (
"log"

View File

@@ -131,7 +131,7 @@ func (c *ClnClient) OpenChannel(req *OpenChannelRequest) (*wire.OutPoint, error)
return nil, err
}
channelPoint, err := NewOutPoint(fundingTxId[:], uint32(fundResult.FundingTxOutputNum))
channelPoint, err := basetypes.NewOutPoint(fundingTxId[:], uint32(fundResult.FundingTxOutputNum))
if err != nil {
log.Printf("CLN: NewOutPoint(%s, %d) error: %v", fundingTxId.String(), fundResult.FundingTxOutputNum, err)
return nil, err

3
db.go
View File

@@ -6,6 +6,7 @@ import (
"log"
"time"
"github.com/breez/lspd/basetypes"
"github.com/btcsuite/btcd/wire"
"github.com/jackc/pgtype"
"github.com/jackc/pgx/v4"
@@ -46,7 +47,7 @@ func paymentInfo(htlcPaymentHash []byte) ([]byte, []byte, []byte, int64, int64,
var cp *wire.OutPoint
if fundingTxID != nil {
cp, err = NewOutPoint(fundingTxID, uint32(fundingTxOutnum.Int))
cp, err = basetypes.NewOutPoint(fundingTxID, uint32(fundingTxOutnum.Int))
if err != nil {
log.Printf("invalid funding txid in database %x", fundingTxID)
}

View File

@@ -126,7 +126,7 @@ func (c *LndClient) OpenChannel(req *OpenChannelRequest) (*wire.OutPoint, error)
return nil, fmt.Errorf("LND: OpenChannel() error: %w", err)
}
result, err := NewOutPoint(channelPoint.GetFundingTxidBytes(), channelPoint.OutputIndex)
result, err := basetypes.NewOutPoint(channelPoint.GetFundingTxidBytes(), channelPoint.OutputIndex)
if err != nil {
log.Printf("LND: OpenChannel returned invalid outpoint. error: %v", err)
return nil, err