diff --git a/yggdrasil/peers.txt b/peers.txt similarity index 100% rename from yggdrasil/peers.txt rename to peers.txt diff --git a/yggdrasil/autopeering.go b/yggdrasil/autopeering.go index b5b5241..0b9ec1c 100644 --- a/yggdrasil/autopeering.go +++ b/yggdrasil/autopeering.go @@ -25,6 +25,7 @@ type Peer struct { var PublicPeers string const repoURL = "https://github.com/yggdrasil-network/public-peers" +const localPeersPath = "peers.txt" func readPeersFile(path string) []url.URL { data, err := os.ReadFile(path) @@ -53,13 +54,13 @@ func readPeersFile(path string) []url.URL { func getPublicPeers() []url.URL { tempDir, err := os.MkdirTemp("", "public-peers-*") if err != nil { - return readPeersFile("peers.txt") + return readPeersFile(localPeersPath) } defer os.RemoveAll(tempDir) _, err = git.PlainCloneContext(context.Background(), tempDir, false, &git.CloneOptions{URL: repoURL, Depth: 1}) if err != nil { - return readPeersFile("peers.txt") + return readPeersFile(localPeersPath) } var peers []url.URL @@ -86,7 +87,7 @@ func getPublicPeers() []url.URL { }) if len(peers) == 0 { - return readPeersFile("peers.txt") + return readPeersFile(localPeersPath) } return peers } diff --git a/yggdrasil/test.go b/yggdrasil/test.go index f73d2e3..fea528e 100644 --- a/yggdrasil/test.go +++ b/yggdrasil/test.go @@ -8,7 +8,6 @@ import ( "github.com/gologme/log" "github.com/spf13/viper" - adminapi "github.com/yggdrasil-network/yggdrasil-go/src/admin" yggConfig "github.com/yggdrasil-network/yggdrasil-go/src/config" "github.com/yggdrasil-network/yggdrasil-go/src/core" ) @@ -26,7 +25,7 @@ func TestConnectivity(config *viper.Viper) error { cfg.AdminListen = ygg.GetString("admin_listen") cfg.Listen = ygg.GetStringSlice("listen") if ygg.GetString("peers") == "auto" { - publicPeers := getPublicPeers() + publicPeers := RandomPick(GetClosestPeers(getPublicPeers(), 20), 3) var urls []string for _, u := range publicPeers { urls = append(urls, u.String()) @@ -72,15 +71,15 @@ func TestConnectivity(config *viper.Viper) error { defer n.core.Stop() // Start admin socket to query peers. - adminOpts := []adminapi.SetupOption{ - adminapi.ListenAddress(cfg.AdminListen), - } - n.admin, err = adminapi.New(n.core, logger, adminOpts...) - if err != nil { - return err - } - n.admin.SetupAdminHandlers() - defer n.admin.Stop() + //adminOpts := []adminapi.SetupOption{ + // adminapi.ListenAddress(cfg.AdminListen), + //} + //n.admin, err = adminapi.New(n.core, logger, adminOpts...) + //if err != nil { + // return err + //} + //n.admin.SetupAdminHandlers() + //defer n.admin.Stop() // Give the node some time to establish connections. time.Sleep(5 * time.Second)