LBRYCommunity/lbry.go
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 46 Packages Wiki Activity

Fix dht find value and updates from latest protocol changes #90

Merged
shyba merged 5 commits from fix_dht into master 2021-10-05 15:03:23 +02:00
Conversation 0 Commits 5 Files changed 5 +8 -7
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8161f48c15 - Show all commits

12
dht/contact.go
View file

@ -44,14 +44,14 @@ func (c Contact) String() string {
func (c Contact) MarshalJSON() ([]byte, error) { func (c Contact) MarshalJSON() ([]byte, error) {
return json.Marshal(&struct { return json.Marshal(&struct {
ID string ID string
IP string IP string
Port int Port int
PeerPort int PeerPort int
}{ }{
ID: c.ID.Hex(), ID: c.ID.Hex(),
IP: c.IP.String(), IP: c.IP.String(),
Port: c.Port, Port: c.Port,
PeerPort: c.PeerPort, PeerPort: c.PeerPort,
}) })
} }

2
dht/rpc.go
View file

@ -102,7 +102,7 @@ type RpcIterativeFindValueArgs struct {
type RpcIterativeFindValueResult struct { type RpcIterativeFindValueResult struct {
Contacts []Contact Contacts []Contact
FoundValue bool FoundValue bool
Values []Contact Values []Contact
} }
func (rpc *rpcReceiver) IterativeFindValue(r *http.Request, args *RpcIterativeFindValueArgs, result *RpcIterativeFindValueResult) error { func (rpc *rpcReceiver) IterativeFindValue(r *http.Request, args *RpcIterativeFindValueArgs, result *RpcIterativeFindValueResult) error {

1
extras/util/strings.go
View file

@ -21,6 +21,7 @@ func NormalizeName(s string) string {
c := cases.Fold() c := cases.Fold()
return c.String(norm.NFD.String(s)) return c.String(norm.NFD.String(s))
} }
// ReverseBytesInPlace reverse the bytes. thanks, Satoshi 😒 // ReverseBytesInPlace reverse the bytes. thanks, Satoshi 😒
func ReverseBytesInPlace(s []byte) { func ReverseBytesInPlace(s []byte) {
for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 { for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 {