From c8e835891811eb219a1fa5b071f886f551a1b79d Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Thu, 16 Mar 2023 04:44:15 +0800 Subject: [PATCH] channeldb+lnwire: rename `MsgFundingLocked` to `MsgChannelReady` This commit is created by running, ```shell gofmt -d -w -r 'MsgFundingLocked -> MsgChannelReady' . gco master channeldb/migration ``` --- lnwire/funding_locked.go | 2 +- lnwire/fuzz_test.go | 2 +- lnwire/lnwire_test.go | 4 ++-- lnwire/message.go | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lnwire/funding_locked.go b/lnwire/funding_locked.go index ab741433d..e2625f48b 100644 --- a/lnwire/funding_locked.go +++ b/lnwire/funding_locked.go @@ -111,5 +111,5 @@ func (c *ChannelReady) Encode(w *bytes.Buffer, pver uint32) error { // // This is part of the lnwire.Message interface. func (c *ChannelReady) MsgType() MessageType { - return MsgFundingLocked + return MsgChannelReady } diff --git a/lnwire/fuzz_test.go b/lnwire/fuzz_test.go index 34d144c84..bd1995eab 100644 --- a/lnwire/fuzz_test.go +++ b/lnwire/fuzz_test.go @@ -289,7 +289,7 @@ func FuzzFundingCreated(f *testing.F) { func FuzzFundingLocked(f *testing.F) { f.Fuzz(func(t *testing.T, data []byte) { // Prefix with MsgFundingLocked. - data = prefixWithMsgType(data, MsgFundingLocked) + data = prefixWithMsgType(data, MsgChannelReady) // Pass the message into our general fuzz harness for wire // messages! diff --git a/lnwire/lnwire_test.go b/lnwire/lnwire_test.go index d4b4e7dab..d55b4efda 100644 --- a/lnwire/lnwire_test.go +++ b/lnwire/lnwire_test.go @@ -566,7 +566,7 @@ func TestLightningWireProtocol(t *testing.T) { v[0] = reflect.ValueOf(req) }, - MsgFundingLocked: func(v []reflect.Value, r *rand.Rand) { + MsgChannelReady: func(v []reflect.Value, r *rand.Rand) { var c [32]byte if _, err := r.Read(c[:]); err != nil { @@ -1013,7 +1013,7 @@ func TestLightningWireProtocol(t *testing.T) { }, }, { - msgType: MsgFundingLocked, + msgType: MsgChannelReady, scenario: func(m ChannelReady) bool { return mainScenario(&m) }, diff --git a/lnwire/message.go b/lnwire/message.go index 7ededf595..ad065bb46 100644 --- a/lnwire/message.go +++ b/lnwire/message.go @@ -31,7 +31,7 @@ const ( MsgAcceptChannel = 33 MsgFundingCreated = 34 MsgFundingSigned = 35 - MsgFundingLocked = 36 + MsgChannelReady = 36 MsgShutdown = 38 MsgClosingSigned = 39 MsgUpdateAddHTLC = 128 @@ -88,7 +88,7 @@ func (t MessageType) String() string { return "MsgFundingCreated" case MsgFundingSigned: return "MsgFundingSigned" - case MsgFundingLocked: + case MsgChannelReady: return "FundingLocked" case MsgShutdown: return "Shutdown" @@ -190,7 +190,7 @@ func makeEmptyMessage(msgType MessageType) (Message, error) { msg = &FundingCreated{} case MsgFundingSigned: msg = &FundingSigned{} - case MsgFundingLocked: + case MsgChannelReady: msg = &ChannelReady{} case MsgShutdown: msg = &Shutdown{}