Skip to content

Commit bee25e0

Browse files
committed
multi: bump lnd, use renamed AuxTrafficShaper
1 parent 7f31253 commit bee25e0

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

docs/examples/basic-price-oracle/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ require (
9898
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
9999
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
100100
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
101-
github.com/lightningnetwork/lnd v0.18.4-beta.rc1 // indirect
101+
github.com/lightningnetwork/lnd v0.18.4-beta.rc1.0.20241205204908-f312064bfbd5 // indirect
102102
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
103103
github.com/lightningnetwork/lnd/fn v1.2.3 // indirect
104104
github.com/lightningnetwork/lnd/healthcheck v1.2.5 // indirect

docs/examples/basic-price-oracle/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display h1:Y2WiPkBS
432432
github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
433433
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
434434
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
435-
github.com/lightningnetwork/lnd v0.18.4-beta.rc1 h1:z6hFKvtbfo8udPrIb81GbSoKlUWd06d4LRxTkD19IMQ=
436-
github.com/lightningnetwork/lnd v0.18.4-beta.rc1/go.mod h1:nPRQzLla5uHPQFyyZn8r9Vgddkd23PBUDa9rggEPOfY=
435+
github.com/lightningnetwork/lnd v0.18.4-beta.rc1.0.20241205204908-f312064bfbd5 h1:YJ/DPJd3YyPWmvv5b74KdpCFi3uBMdmDei54AageGpc=
436+
github.com/lightningnetwork/lnd v0.18.4-beta.rc1.0.20241205204908-f312064bfbd5/go.mod h1:nPRQzLla5uHPQFyyZn8r9Vgddkd23PBUDa9rggEPOfY=
437437
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
438438
github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
439439
github.com/lightningnetwork/lnd/fn v1.2.3 h1:Q1OrgNSgQynVheBNa16CsKVov1JI5N2AR6G07x9Mles=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
2929
github.com/lightninglabs/lndclient v0.18.4-7
3030
github.com/lightninglabs/neutrino/cache v1.1.2
31-
github.com/lightningnetwork/lnd v0.18.4-beta.rc1
31+
github.com/lightningnetwork/lnd v0.18.4-beta.rc1.0.20241205204908-f312064bfbd5
3232
github.com/lightningnetwork/lnd/cert v1.2.2
3333
github.com/lightningnetwork/lnd/clock v1.1.1
3434
github.com/lightningnetwork/lnd/fn v1.2.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display h1:Y2WiPkBS
500500
github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
501501
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
502502
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
503-
github.com/lightningnetwork/lnd v0.18.4-beta.rc1 h1:z6hFKvtbfo8udPrIb81GbSoKlUWd06d4LRxTkD19IMQ=
504-
github.com/lightningnetwork/lnd v0.18.4-beta.rc1/go.mod h1:nPRQzLla5uHPQFyyZn8r9Vgddkd23PBUDa9rggEPOfY=
503+
github.com/lightningnetwork/lnd v0.18.4-beta.rc1.0.20241205204908-f312064bfbd5 h1:YJ/DPJd3YyPWmvv5b74KdpCFi3uBMdmDei54AageGpc=
504+
github.com/lightningnetwork/lnd v0.18.4-beta.rc1.0.20241205204908-f312064bfbd5/go.mod h1:nPRQzLla5uHPQFyyZn8r9Vgddkd23PBUDa9rggEPOfY=
505505
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
506506
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
507507
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=

server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"github.com/lightningnetwork/lnd/channeldb"
2929
lfn "github.com/lightningnetwork/lnd/fn"
3030
"github.com/lightningnetwork/lnd/funding"
31+
"github.com/lightningnetwork/lnd/htlcswitch"
3132
"github.com/lightningnetwork/lnd/input"
3233
"github.com/lightningnetwork/lnd/lncfg"
3334
"github.com/lightningnetwork/lnd/lnrpc"
@@ -37,7 +38,6 @@ import (
3738
"github.com/lightningnetwork/lnd/lnwire"
3839
"github.com/lightningnetwork/lnd/macaroons"
3940
"github.com/lightningnetwork/lnd/msgmux"
40-
"github.com/lightningnetwork/lnd/routing"
4141
"github.com/lightningnetwork/lnd/sweep"
4242
"github.com/lightningnetwork/lnd/tlv"
4343
"google.golang.org/grpc"
@@ -696,14 +696,14 @@ func (s *Server) Stop() error {
696696

697697
// A compile-time check to ensure that Server fully implements the
698698
// lnwallet.AuxLeafStore, lnd.AuxDataParser, lnwallet.AuxSigner,
699-
// msgmux.Endpoint, funding.AuxFundingController, routing.TlvTrafficShaper
699+
// msgmux.Endpoint, funding.AuxFundingController, htlcswitch.AuxTrafficShaper
700700
// and chancloser.AuxChanCloser interfaces.
701701
var _ lnwl.AuxLeafStore = (*Server)(nil)
702702
var _ lnd.AuxDataParser = (*Server)(nil)
703703
var _ lnwl.AuxSigner = (*Server)(nil)
704704
var _ msgmux.Endpoint = (*Server)(nil)
705705
var _ funding.AuxFundingController = (*Server)(nil)
706-
var _ routing.TlvTrafficShaper = (*Server)(nil)
706+
var _ htlcswitch.AuxTrafficShaper = (*Server)(nil)
707707
var _ chancloser.AuxChanCloser = (*Server)(nil)
708708
var _ lnwl.AuxContractResolver = (*Server)(nil)
709709
var _ sweep.AuxSweeper = (*Server)(nil)

tapchannel/aux_traffic_shaper.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"github.com/lightninglabs/taproot-assets/rfqmsg"
1313
cmsg "github.com/lightninglabs/taproot-assets/tapchannelmsg"
1414
lfn "github.com/lightningnetwork/lnd/fn"
15+
"github.com/lightningnetwork/lnd/htlcswitch"
1516
"github.com/lightningnetwork/lnd/input"
1617
"github.com/lightningnetwork/lnd/lnwallet"
1718
"github.com/lightningnetwork/lnd/lnwire"
18-
"github.com/lightningnetwork/lnd/routing"
1919
"github.com/lightningnetwork/lnd/tlv"
2020
)
2121

@@ -84,8 +84,8 @@ func (s *AuxTrafficShaper) Stop() error {
8484
}
8585

8686
// A compile-time check to ensure that AuxTrafficShaper fully implements the
87-
// routing.TlvTrafficShaper interface.
88-
var _ routing.TlvTrafficShaper = (*AuxTrafficShaper)(nil)
87+
// htlcswitch.AuxTrafficShaper interface.
88+
var _ htlcswitch.AuxTrafficShaper = (*AuxTrafficShaper)(nil)
8989

9090
// ShouldHandleTraffic is called in order to check if the channel identified by
9191
// the provided channel ID is handled by the traffic shaper implementation. If

0 commit comments

Comments
 (0)