swarm/network: Extract peer and addr types out of protocol file

swarm/network/protocol.go

@@ -18,14 +18,11 @@ package network
 
 import (
 	"context"
-	"crypto/ecdsa"
 	"errors"
 	"fmt"
-	"net"
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/protocols"
@@ -333,63 +330,3 @@ func (b *Bzz) GetOrCreateHandshake(peerID enode.ID) (*HandshakeMsg, bool) {
 
 	return handshake, found
 }
-
-// BzzAddr implements the PeerAddr interface
-type BzzAddr struct {
-	OAddr []byte
-	UAddr []byte
-}
-
-// Address implements OverlayPeer interface to be used in Overlay.
-func (a *BzzAddr) Address() []byte {
-	return a.OAddr
-}
-
-// Over returns the overlay address.
-func (a *BzzAddr) Over() []byte {
-	return a.OAddr
-}
-
-// Under returns the underlay address.
-func (a *BzzAddr) Under() []byte {
-	return a.UAddr
-}
-
-// ID returns the node identifier in the underlay.
-func (a *BzzAddr) ID() enode.ID {
-	n, err := enode.ParseV4(string(a.UAddr))
-	if err != nil {
-		return enode.ID{}
-	}
-	return n.ID()
-}
-
-// Update updates the underlay address of a peer record
-func (a *BzzAddr) Update(na *BzzAddr) *BzzAddr {
-	return &BzzAddr{a.OAddr, na.UAddr}
-}
-
-// String pretty prints the address
-func (a *BzzAddr) String() string {
-	return fmt.Sprintf("%x <%s>", a.OAddr, a.UAddr)
-}
-
-// RandomAddr is a utility method generating an address from a public key
-func RandomAddr() *BzzAddr {
-	key, err := crypto.GenerateKey()
-	if err != nil {
-		panic("unable to generate key")
-	}
-	node := enode.NewV4(&key.PublicKey, net.IP{127, 0, 0, 1}, 30303, 30303)
-	return NewAddr(node)
-}
-
-// NewAddr constucts a BzzAddr from a node record.
-func NewAddr(node *enode.Node) *BzzAddr {
-	return &BzzAddr{OAddr: node.ID().Bytes(), UAddr: []byte(node.String())}
-}
-
-func PrivateKeyToBzzKey(prvKey *ecdsa.PrivateKey) []byte {
-	pubkeyBytes := crypto.FromECDSAPub(&prvKey.PublicKey)
-	return crypto.Keccak256Hash(pubkeyBytes).Bytes()
-}

swarm/network/types.go

@@ -0,0 +1,70 @@
+package network
+
+import (
+	"crypto/ecdsa"
+	"fmt"
+	"net"
+
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/p2p/enode"
+)
+
+// BzzAddr implements the PeerAddr interface
+type BzzAddr struct {
+	OAddr []byte
+	UAddr []byte
+}
+
+// Address implements OverlayPeer interface to be used in Overlay.
+func (a *BzzAddr) Address() []byte {
+	return a.OAddr
+}
+
+// Over returns the overlay address.
+func (a *BzzAddr) Over() []byte {
+	return a.OAddr
+}
+
+// Under returns the underlay address.
+func (a *BzzAddr) Under() []byte {
+	return a.UAddr
+}
+
+// ID returns the node identifier in the underlay.
+func (a *BzzAddr) ID() enode.ID {
+	n, err := enode.ParseV4(string(a.UAddr))
+	if err != nil {
+		return enode.ID{}
+	}
+	return n.ID()
+}
+
+// Update updates the underlay address of a peer record
+func (a *BzzAddr) Update(na *BzzAddr) *BzzAddr {
+	return &BzzAddr{a.OAddr, na.UAddr}
+}
+
+// String pretty prints the address
+func (a *BzzAddr) String() string {
+	return fmt.Sprintf("%x <%s>", a.OAddr, a.UAddr)
+}
+
+// RandomAddr is a utility method generating an address from a public key
+func RandomAddr() *BzzAddr {
+	key, err := crypto.GenerateKey()
+	if err != nil {
+		panic("unable to generate key")
+	}
+	node := enode.NewV4(&key.PublicKey, net.IP{127, 0, 0, 1}, 30303, 30303)
+	return NewAddr(node)
+}
+
+// NewAddr constucts a BzzAddr from a node record.
+func NewAddr(node *enode.Node) *BzzAddr {
+	return &BzzAddr{OAddr: node.ID().Bytes(), UAddr: []byte(node.String())}
+}
+
+func PrivateKeyToBzzKey(prvKey *ecdsa.PrivateKey) []byte {
+	pubkeyBytes := crypto.FromECDSAPub(&prvKey.PublicKey)
+	return crypto.Keccak256Hash(pubkeyBytes).Bytes()
+}