channeldb+graph/db: move net.Addr encode/decode to graph db package
In preparation for moving the graph related schema structs to the graph package in an upcoming commit, we move these methods to the graph package. The structs we will move make use of these methods but we still import them from channeldb so as to keep the ReadElement and WriteElement helpers working as they do today.
This commit is contained in:
8 files changed
+30
-14
No files matched your search
+5
-4
@@ -11,6 +11,7 @@ import (
|
||||
"github.com/btcsuite/btcd/btcutil"
|
||||
"github.com/btcsuite/btcd/chaincfg/chainhash"
|
||||
"github.com/btcsuite/btcd/wire"
|
||||
graphdb "github.com/lightningnetwork/lnd/graph/db"
|
||||
"github.com/lightningnetwork/lnd/keychain"
|
||||
"github.com/lightningnetwork/lnd/lnwire"
|
||||
"github.com/lightningnetwork/lnd/shachain"
|
||||
@@ -218,7 +219,7 @@ func WriteElement(w io.Writer, element interface{}) error {
|
||||
}
|
||||
|
||||
case net.Addr:
|
||||
if err := SerializeAddr(w, e); err != nil {
|
||||
if err := graphdb.SerializeAddr(w, e); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -228,7 +229,7 @@ func WriteElement(w io.Writer, element interface{}) error {
|
||||
}
|
||||
|
||||
for _, addr := range e {
|
||||
if err := SerializeAddr(w, addr); err != nil {
|
||||
if err := graphdb.SerializeAddr(w, addr); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -451,7 +452,7 @@ func ReadElement(r io.Reader, element interface{}) error {
|
||||
}
|
||||
|
||||
case *net.Addr:
|
||||
addr, err := DeserializeAddr(r)
|
||||
addr, err := graphdb.DeserializeAddr(r)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -465,7 +466,7 @@ func ReadElement(r io.Reader, element interface{}) error {
|
||||
|
||||
*e = make([]net.Addr, numAddrs)
|
||||
for i := uint32(0); i < numAddrs; i++ {
|
||||
addr, err := DeserializeAddr(r)
|
||||
addr, err := graphdb.DeserializeAddr(r)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user