mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-23 06:35:07 +01:00
Code Issues Projects Releases Wiki Activity

watchtower/multi: define AltruistSessions feature bit as 0/1

Browse source
This commit is contained in:
Conner Fromknecht 2019-06-13 17:34:16 -07:00
parent 86e1d111e5
commit 2d47618055
No known key found for this signature in database
GPG key ID: E7D737B67FA592C7
5 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
watchtower/wtclient/session_negotiator.go
View file

@ -112,7 +112,7 @@ var _ SessionNegotiator = (*sessionNegotiator)(nil)
// newSessionNegotiator initializes a fresh sessionNegotiator instance. // newSessionNegotiator initializes a fresh sessionNegotiator instance.
func newSessionNegotiator(cfg *NegotiatorConfig) *sessionNegotiator { func newSessionNegotiator(cfg *NegotiatorConfig) *sessionNegotiator {
localInit := wtwire.NewInitMessage( localInit := wtwire.NewInitMessage(
lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired), lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
cfg.ChainHash, cfg.ChainHash,
) )

2
watchtower/wtclient/session_queue.go
View file

@ -109,7 +109,7 @@ type sessionQueue struct {
// newSessionQueue intiializes a fresh sessionQueue. // newSessionQueue intiializes a fresh sessionQueue.
func newSessionQueue(cfg *sessionQueueConfig) *sessionQueue { func newSessionQueue(cfg *sessionQueueConfig) *sessionQueue {
localInit := wtwire.NewInitMessage( localInit := wtwire.NewInitMessage(
lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired), lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
cfg.ChainHash, cfg.ChainHash,
) )

2
watchtower/wtserver/server.go
View file

@ -92,7 +92,7 @@ type Server struct {
// sessions and send state updates. // sessions and send state updates.
func New(cfg *Config) (*Server, error) { func New(cfg *Config) (*Server, error) {
localInit := wtwire.NewInitMessage( localInit := wtwire.NewInitMessage(
lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional), lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
cfg.ChainHash, cfg.ChainHash,
) )

18
watchtower/wtwire/features.go
View file

@ -5,18 +5,18 @@ import "github.com/lightningnetwork/lnd/lnwire"
// FeatureNames holds a mapping from each feature bit understood by this // FeatureNames holds a mapping from each feature bit understood by this
// implementation to its common name. // implementation to its common name.
var FeatureNames = map[lnwire.FeatureBit]string{ var FeatureNames = map[lnwire.FeatureBit]string{
WtSessionsRequired: "wt-sessions", AltruistSessionsRequired: "altruist-sessions",
WtSessionsOptional: "wt-sessions", AltruistSessionsOptional: "altruist-sessions",
} }
const ( const (
// WtSessionsRequired specifies that the advertising node requires the // AltruistSessionsRequired specifies that the advertising node requires
// remote party to understand the protocol for creating and updating // the remote party to understand the protocol for creating and updating
// watchtower sessions. // watchtower sessions.
WtSessionsRequired lnwire.FeatureBit = 8 AltruistSessionsRequired lnwire.FeatureBit = 0
// WtSessionsOptional specifies that the advertising node can support // AltruistSessionsOptional specifies that the advertising node can
// a remote party who understand the protocol for creating and updating // support a remote party who understand the protocol for creating and
// watchtower sessions. // updating watchtower sessions.
WtSessionsOptional lnwire.FeatureBit = 9 AltruistSessionsOptional lnwire.FeatureBit = 1
) )

18
watchtower/wtwire/init_test.go
View file

@ -26,37 +26,37 @@ type checkRemoteInitTest struct {
var checkRemoteInitTests = []checkRemoteInitTest{ var checkRemoteInitTests = []checkRemoteInitTest{
{ {
name: "same chain, local-optional remote-required", name: "same chain, local-optional remote-required",
lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional), lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
lHash: testnetChainHash, lHash: testnetChainHash,
rFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired), rFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
rHash: testnetChainHash, rHash: testnetChainHash,
}, },
{ {
name: "same chain, local-required remote-optional", name: "same chain, local-required remote-optional",
lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired), lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
lHash: testnetChainHash, lHash: testnetChainHash,
rFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional), rFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
rHash: testnetChainHash, rHash: testnetChainHash,
}, },
{ {
name: "different chain, local-optional remote-required", name: "different chain, local-optional remote-required",
lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional), lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
lHash: testnetChainHash, lHash: testnetChainHash,
rFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired), rFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
rHash: mainnetChainHash, rHash: mainnetChainHash,
expErr: wtwire.NewErrUnknownChainHash(mainnetChainHash), expErr: wtwire.NewErrUnknownChainHash(mainnetChainHash),
}, },
{ {
name: "different chain, local-required remote-optional", name: "different chain, local-required remote-optional",
lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional), lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
lHash: testnetChainHash, lHash: testnetChainHash,
rFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsRequired), rFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsRequired),
rHash: mainnetChainHash, rHash: mainnetChainHash,
expErr: wtwire.NewErrUnknownChainHash(mainnetChainHash), expErr: wtwire.NewErrUnknownChainHash(mainnetChainHash),
}, },
{ {
name: "same chain, remote-unknown-required", name: "same chain, remote-unknown-required",
lFeatures: lnwire.NewRawFeatureVector(wtwire.WtSessionsOptional), lFeatures: lnwire.NewRawFeatureVector(wtwire.AltruistSessionsOptional),
lHash: testnetChainHash, lHash: testnetChainHash,
rFeatures: lnwire.NewRawFeatureVector(lnwire.GossipQueriesRequired), rFeatures: lnwire.NewRawFeatureVector(lnwire.GossipQueriesRequired),
rHash: testnetChainHash, rHash: testnetChainHash,