forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/devp2p: add 'links' to enrtree-info.json even when empty

Browse source
This commit is contained in:
Felix Lange 2019-09-19 15:13:52 +02:00
parent 00f4484df5
commit bd6e705799
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/devp2p/dnscmd.go
View file

@ -239,8 +239,8 @@ type dnsDefinition struct {
type dnsMetaJSON struct { type dnsMetaJSON struct {
URL string `json:"url,omitempty"` URL string `json:"url,omitempty"`
Seq uint `json:"seq"` Seq uint `json:"seq"`
Sig string `json:"signature"` Sig string `json:"signature,omitempty"`
Links []string `json:"links,omitempty"` Links []string `json:"links"`
LastModified time.Time `json:"lastModified"` LastModified time.Time `json:"lastModified"`
} }
@ -251,6 +251,9 @@ func treeToDefinition(url string, t *dnsdisc.Tree) *dnsDefinition {
Sig: t.Signature(), Sig: t.Signature(),
Links: t.Links(), Links: t.Links(),
} }
if meta.Links == nil {
meta.Links = []string{}
}
return &dnsDefinition{Meta: meta, Nodes: t.Nodes()} return &dnsDefinition{Meta: meta, Nodes: t.Nodes()}
} }
@ -262,6 +265,9 @@ func loadTreeDefinition(directory string) *dnsDefinition {
if err != nil && !os.IsNotExist(err) { if err != nil && !os.IsNotExist(err) {
exit(err) exit(err)
} }
if def.Meta.Links == nil {
def.Meta.Links = []string{}
}
// Check link syntax. // Check link syntax.
for _, link := range def.Meta.Links { for _, link := range def.Meta.Links {
if _, _, err := dnsdisc.ParseURL(link); err != nil { if _, _, err := dnsdisc.ParseURL(link); err != nil {