mirror of
https://github.com/aljazceru/lspd.git
synced 2026-02-23 15:04:23 +01:00
cleanup: move outpoint to basetypes package
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package basetypes
|
||||
|
||||
import (
|
||||
"log"
|
||||
@@ -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
3
db.go
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user