Skip to content

Add peer discovery #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tzdybal merged 18 commits into from
Mar 23, 2021
Merged

Add peer discovery #17

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
636483e
Add context to client
tzdybal Mar 4, 2021
579442d
Not working, DHT routing as option + active peer dicovery
tzdybal Mar 5, 2021
f924497
Use DHT in server mode
tzdybal Mar 5, 2021
64f86ce
WIP
tzdybal Mar 10, 2021
9645437
Add default configuration values.
tzdybal Mar 13, 2021
ce095e1
Use DHT for bootstrapping and peer discovery
tzdybal Mar 13, 2021
a4944ef
Add unit test of seeds string parsing function
tzdybal Mar 13, 2021
0dffaff
Remove outdated comment
tzdybal Mar 15, 2021
0a672c7
Add DHT-based active peer discovery
tzdybal Mar 15, 2021
34ec982
Improved advertising logic and error handling
tzdybal Mar 17, 2021
a560ff6
Simple test of peer discovery
tzdybal Mar 17, 2021
406e411
Merge tracking branch 'main' into tzdybal/p2p/discovery
tzdybal Mar 18, 2021
7f56650
Extract const for hardcoded duration
tzdybal Mar 18, 2021
f60014a
Pass context instead of storing it in struct
tzdybal Mar 19, 2021
4fe1062
Change default listen address to 0.0.0.0
tzdybal Mar 19, 2021
2d4c64a
Wrap libp2p host with RoutedHost
tzdybal Mar 19, 2021
504b75e
go mod tidy
tzdybal Mar 19, 2021
7777439
Ensure that context passed to libp2p is cancelled
tzdybal Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simple test of peer discovery
  • Loading branch information
@tzdybal
tzdybal committed Mar 17, 2021
commit a560ff6e17c38a2e871ccab63e44aaf01c57c6c8
95 changes: 93 additions & 2 deletions p2p/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"crypto/rand"
"fmt"
"testing"
"time"

"github.com/ipfs/go-log"
"github.com/libp2p/go-libp2p-core/crypto"
Expand Down Expand Up @@ -116,7 +115,6 @@ func TestBootstrapping(t *testing.T) {
err = client1.Start()
defer client1.Close()
assert.NoError(err)
time.Sleep(1 * time.Second)

err = client2.Start()
defer client2.Close()
Expand All @@ -143,7 +141,100 @@ func TestBootstrapping(t *testing.T) {
}

func TestDiscovery(t *testing.T) {
assert := assert.New(t)
require := require.New(t)
logger := &TestLogger{t}

// TODO: create helper function to create "connected" network
privKey1, _, _ := crypto.GenerateEd25519Key(rand.Reader)
privKey2, _, _ := crypto.GenerateEd25519Key(rand.Reader)
privKey3, _, _ := crypto.GenerateEd25519Key(rand.Reader)
privKey4, _, _ := crypto.GenerateEd25519Key(rand.Reader)
privKey5, _, _ := crypto.GenerateEd25519Key(rand.Reader)

cid1, err := peer.IDFromPrivateKey(privKey1)
require.NoError(err)
require.NotEmpty(cid1)

cid2, err := peer.IDFromPrivateKey(privKey2)
require.NoError(err)
require.NotEmpty(cid2)

cid3, err := peer.IDFromPrivateKey(privKey3)
require.NoError(err)
require.NotEmpty(cid2)

// client1 has no seeds
client1, err := NewClient(context.Background(), config.P2PConfig{ListenAddress: "/ip4/0.0.0.0/tcp/7676"}, privKey1, logger)
require.NoError(err)
require.NotNil(client1)

// client2 will use client1 as predefined seed
client2, err := NewClient(context.Background(), config.P2PConfig{
ListenAddress: "/ip4/127.0.0.1/tcp/7677",
Seeds: "/ip4/127.0.0.1/tcp/7676/p2p/" + cid1.String(),
}, privKey2, logger)
require.NoError(err)

// client3 will use clien1 as predefined seed
client3, err := NewClient(context.Background(), config.P2PConfig{
ListenAddress: "/ip4/127.0.0.1/tcp/7678",
Seeds: "/ip4/127.0.0.1/tcp/7676/p2p/" + cid1.String(),
}, privKey3, logger)
require.NoError(err)

// client4 will use clien2 as seed
client4, err := NewClient(context.Background(), config.P2PConfig{
ListenAddress: "/ip4/127.0.0.1/tcp/7679",
Seeds: "/ip4/127.0.0.1/tcp/7677/p2p/" + cid2.String(),
}, privKey4, logger)
require.NoError(err)

// client5 will use clien2 as seed
client5, err := NewClient(context.Background(), config.P2PConfig{
ListenAddress: "/ip4/127.0.0.1/tcp/7680",
Seeds: "/ip4/127.0.0.1/tcp/7678/p2p/" + cid3.String(),
}, privKey5, logger)
require.NoError(err)

client2.chainID = "ORU2"
client3.chainID = "ORU2"
client4.chainID = "ORU1"
client5.chainID = "ORU1"

err = client1.Start()
defer client1.Close()
assert.NoError(err)

err = client2.Start()
defer client2.Close()
assert.NoError(err)

err = client3.Start()
defer client3.Close()
assert.NoError(err)

err = client4.Start()
defer client4.Close()
assert.NoError(err)

err = client4.Start()
defer client4.Close()
assert.NoError(err)

err = client5.Start()
defer client5.Close()
assert.NoError(err)

// wait for clients to finish refreshing routing tables
<-client1.dht.RefreshRoutingTable()
<-client2.dht.RefreshRoutingTable()
<-client3.dht.RefreshRoutingTable()
<-client4.dht.RefreshRoutingTable()
<-client5.dht.RefreshRoutingTable()

assert.Contains(client4.host.Network().Peers(), client5.host.ID())
assert.Contains(client5.host.Network().Peers(), client4.host.ID())
}

func TestSeedStringParsing(t *testing.T) {
Expand Down