wip

Author: qdm12

dot/core/interface.go

@@ -6,7 +6,7 @@ package core
 import (
 	"sync"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 
 	"github.com/ChainSafe/gossamer/dot/network"
 	"github.com/ChainSafe/gossamer/dot/peerset"

dot/core/messages.go

@@ -13,7 +13,7 @@ import (
 	"github.com/ChainSafe/gossamer/lib/runtime"
 	"github.com/ChainSafe/gossamer/lib/transaction"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 func (s *Service) validateTransaction(peerID peer.ID, head *types.Header, rt runtime.Instance,

dot/core/messages_integration_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/ChainSafe/gossamer/pkg/scale"
 
 	"github.com/golang/mock/gomock"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/require"
 )
 

dot/core/messages_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/ChainSafe/gossamer/lib/transaction"
 
 	"github.com/golang/mock/gomock"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/assert"
 )
 

dot/core/mock_core_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 var errInvalidRole = errors.New("invalid role")

dot/core/mocks/network_mock.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/pkg/scale"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/require"
 )
 

dot/network/block_announce.go

@@ -0,0 +1,88 @@
+package network
+
+import (
+	"context"
+
+	oldconnmgr "github.com/libp2p/go-libp2p-core/connmgr"
+	oldevent "github.com/libp2p/go-libp2p-core/event"
+	oldhost "github.com/libp2p/go-libp2p-core/host"
+	oldnetwork "github.com/libp2p/go-libp2p-core/network"
+	oldpeer "github.com/libp2p/go-libp2p-core/peer"
+	oldpeerstore "github.com/libp2p/go-libp2p-core/peerstore"
+	oldprotocol "github.com/libp2p/go-libp2p-core/protocol"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/multiformats/go-multiaddr"
+)
+
+func hostToDeprecated(host host.Host) (deprecated oldhost.Host) {
+	return &deprecatedHostWrapper{host: host}
+}
+
+type deprecatedHostWrapper struct {
+	host host.Host
+}
+
+func (d *deprecatedHostWrapper) ID() oldpeer.ID {
+	return peerIDToDeprecated(d.host.ID())
+}
+
+func (d *deprecatedHostWrapper) Peerstore() oldpeerstore.Peerstore {
+	return peerStoreToDeprecated(d.host.Peerstore())
+}
+
+func (d *deprecatedHostWrapper) Addrs() []multiaddr.Multiaddr {
+	return d.host.Addrs()
+}
+
+func (d *deprecatedHostWrapper) Network() oldnetwork.Network {
+	return networkToDeprecated(d.host.Network())
+}
+
+func (d *deprecatedHostWrapper) Mux() oldprotocol.Switch {
+	return d.host.Switch()
+}
+
+func (d *deprecatedHostWrapper) Connect(ctx context.Context, pi oldpeer.AddrInfo) error {
+	return d.host.Connect(ctx, deprecatedPeerAddrInfoToNew(pi))
+}
+
+func (d *deprecatedHostWrapper) SetStreamHandler(pid oldprotocol.ID, handler oldnetwork.StreamHandler) {
+	d.host.SetStreamHandler(
+		deprecatedProtocolIDToNew(pid), handler)
+}
+
+func (d *deprecatedHostWrapper) SetStreamHandlerMatch(pid oldprotocol.ID,
+	matcher func(string) bool, handler oldnetwork.StreamHandler) {
+	d.host.SetStreamHandlerMatch(
+		deprecatedProtocolIDToNew(pid), matcher, handler)
+}
+
+func (d *deprecatedHostWrapper) RemoveStreamHandler(pid oldprotocol.ID) {
+	d.host.RemoveStreamHandler(deprecatedProtocolIDToNew(pid))
+}
+
+func (d *deprecatedHostWrapper) NewStream(ctx context.Context, p oldpeer.ID,
+	pids ...oldprotocol.ID) (oldStream oldnetwork.Stream, err error) {
+	stream, err := d.host.NewStream(ctx,
+		deprecatedPeerIDToNew(p),
+		deprecatedProtocolIDsToNew(pids)...,
+	)
+	if err != nil {
+		return nil, err
+	}
+	return &deprecatedStreamWrapper{stream}, nil
+}
+
+func (d *deprecatedHostWrapper) Close() error {
+	return d.host.Close()
+}
+
+func (d *deprecatedHostWrapper) ConnManager() oldconnmgr.ConnManager {
+	connManager := d.host.ConnManager()
+	return connManager
+}
+
+func (d *deprecatedHostWrapper) EventBus() oldevent.Bus {
+	eventBus := d.host.EventBus()
+	return eventBus
+}

dot/network/block_announce_test.go

@@ -0,0 +1,14 @@
+package network
+
+import (
+	"github.com/libp2p/go-libp2p-core/network"
+	oldnetwork "github.com/libp2p/go-libp2p-core/network"
+)
+
+func networkToDeprecated(network network.Network) (deprecated oldnetwork.Network) {
+	return &deprecatedNetworkWrapper{network: network}
+}
+
+type deprecatedNetworkWrapper struct {
+	network network.Network
+}