gregorbednov/lbc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
Gregory Bednov 2025-07-16 13:57:19 +03:00
commit 9c88f7e744
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

0
yggdrasil/peers.txt → peers.txt
View file

7
yggdrasil/autopeering.go
View file

@ -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
}

21
yggdrasil/test.go
View file

@ -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)