Skip to content

Commit

Permalink
Removed Peers from migration config
Browse files Browse the repository at this point in the history
  • Loading branch information
gammazero committed May 3, 2021
1 parent c075e8c commit 51b293d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 42 deletions.
5 changes: 0 additions & 5 deletions config/migration.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package config

import "github.com/libp2p/go-libp2p-core/peer"

const DefaultMigrationKeep = "cache"

var DefaultMigrationDownloadSources = []string{"HTTPS", "IPFS"}
Expand All @@ -16,7 +14,4 @@ type Migration struct {
// Whether or not to keep the migration after downloading it.
// Options are "discard", "cache", "pin". Empty string for default.
Keep string
// Peers lists the nodes to attempt to connect with when downloading
// migrations.
Peers []peer.AddrInfo
}
38 changes: 1 addition & 37 deletions config/migration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,7 @@ func TestMigrationDecode(t *testing.T) {
str := `
{
"DownloadSources": ["IPFS", "HTTP", "127.0.0.1"],
"Keep": "cache",
"Peers": [
{
"ID": "12D3KooWGC6TvWhfapngX6wvJHMYvKpDMXPb3ZnCZ6dMoaMtimQ5",
"Addrs": ["/ip4/127.0.0.1/tcp/4001", "/ip4/127.0.0.1/udp/4001/quic"]
},
{
"ID": "12D3KooWGC6TvWhfajpgX6wvJHMYvKpDMXPb3ZnCZ6dMoaMtimQ7",
"Addrs": ["/ip4/10.0.0.2/tcp/4001"]
}
]
"Keep": "cache"
}
`

Expand All @@ -41,30 +31,4 @@ func TestMigrationDecode(t *testing.T) {
if cfg.Keep != "cache" {
t.Error("wrong value for Keep")
}

if len(cfg.Peers) != 2 {
t.Fatal("wrong number of peers")
}

peer := cfg.Peers[0]
if peer.ID.String() != "12D3KooWGC6TvWhfapngX6wvJHMYvKpDMXPb3ZnCZ6dMoaMtimQ5" {
t.Errorf("wrong ID for first peer")
}
if len(peer.Addrs) != 2 {
t.Error("wrong number of addrs for first peer")
}
if peer.Addrs[0].String() != "/ip4/127.0.0.1/tcp/4001" {
t.Error("wrong first addr for first peer")
}
if peer.Addrs[1].String() != "/ip4/127.0.0.1/udp/4001/quic" {
t.Error("wrong second addr for first peer")
}

peer = cfg.Peers[1]
if len(peer.Addrs) != 1 {
t.Fatal("wrong number of addrs for second peer")
}
if peer.Addrs[0].String() != "/ip4/10.0.0.2/tcp/4001" {
t.Error("wrong first addr for second peer")
}
}

0 comments on commit 51b293d

Please sign in to comment.