update ironwood dependency, fix api

This commit is contained in:
Arceliar 2021-05-18 20:43:38 -05:00
parent 8d09e68e80
commit b11cf7a2f2
4 changed files with 7 additions and 7 deletions

2
go.mod
View File

@ -3,7 +3,7 @@ module github.com/yggdrasil-network/yggdrasil-go
go 1.16 go 1.16
require ( require (
github.com/Arceliar/ironwood v0.0.0-20210516202558-11160a0940e1 github.com/Arceliar/ironwood v0.0.0-20210519013150-a5401869b037
github.com/Arceliar/phony v0.0.0-20210209235338-dde1a8dca979 github.com/Arceliar/phony v0.0.0-20210209235338-dde1a8dca979
github.com/cheggaaa/pb/v3 v3.0.6 github.com/cheggaaa/pb/v3 v3.0.6
github.com/fatih/color v1.10.0 // indirect github.com/fatih/color v1.10.0 // indirect

4
go.sum
View File

@ -1,5 +1,5 @@
github.com/Arceliar/ironwood v0.0.0-20210516202558-11160a0940e1 h1:EVa/kL+8lgZmnAit/a0DIacKNZ/lj7NwjmO4B++t4PU= github.com/Arceliar/ironwood v0.0.0-20210519013150-a5401869b037 h1:SQ7opLc8dCNAgyYIeVZUGwvZ5YrfqRLHMwOGWfH/S/k=
github.com/Arceliar/ironwood v0.0.0-20210516202558-11160a0940e1/go.mod h1:RP72rucOFm5udrnEzTmIWLRVGQiV/fSUAQXJ0RST/nk= github.com/Arceliar/ironwood v0.0.0-20210519013150-a5401869b037/go.mod h1:RP72rucOFm5udrnEzTmIWLRVGQiV/fSUAQXJ0RST/nk=
github.com/Arceliar/phony v0.0.0-20210209235338-dde1a8dca979 h1:WndgpSW13S32VLQ3ugUxx2EnnWmgba1kCqPkd4Gk1yQ= github.com/Arceliar/phony v0.0.0-20210209235338-dde1a8dca979 h1:WndgpSW13S32VLQ3ugUxx2EnnWmgba1kCqPkd4Gk1yQ=
github.com/Arceliar/phony v0.0.0-20210209235338-dde1a8dca979/go.mod h1:6Lkn+/zJilRMsKmbmG1RPoamiArC6HS73xbwRyp3UyI= github.com/Arceliar/phony v0.0.0-20210209235338-dde1a8dca979/go.mod h1:6Lkn+/zJilRMsKmbmG1RPoamiArC6HS73xbwRyp3UyI=
github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM= github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=

View File

@ -16,7 +16,7 @@ type GetDHTResponse struct {
type DHTEntry struct { type DHTEntry struct {
PublicKey string `json:"key"` PublicKey string `json:"key"`
Port uint64 `json:"port"` Port uint64 `json:"port"`
Next uint64 `json:"next"` Rest uint64 `json:"rest"`
} }
func (a *AdminSocket) getDHTHandler(req *GetDHTRequest, res *GetDHTResponse) error { func (a *AdminSocket) getDHTHandler(req *GetDHTRequest, res *GetDHTResponse) error {
@ -27,7 +27,7 @@ func (a *AdminSocket) getDHTHandler(req *GetDHTRequest, res *GetDHTResponse) err
res.DHT[so] = DHTEntry{ res.DHT[so] = DHTEntry{
PublicKey: hex.EncodeToString(d.Key[:]), PublicKey: hex.EncodeToString(d.Key[:]),
Port: d.Port, Port: d.Port,
Next: d.Next, Rest: d.Rest,
} }
} }
return nil return nil

View File

@ -31,7 +31,7 @@ type Peer struct {
type DHTEntry struct { type DHTEntry struct {
Key ed25519.PublicKey Key ed25519.PublicKey
Port uint64 Port uint64
Next uint64 Rest uint64
} }
type PathEntry struct { type PathEntry struct {
@ -73,7 +73,7 @@ func (c *Core) GetDHT() []DHTEntry {
var info DHTEntry var info DHTEntry
info.Key = d.Key info.Key = d.Key
info.Port = d.Port info.Port = d.Port
info.Next = d.Next info.Rest = d.Rest
dhts = append(dhts, info) dhts = append(dhts, info)
} }
return dhts return dhts