Skip to content

Commit

Permalink
refactor: export ParseKeys
Browse files Browse the repository at this point in the history
  • Loading branch information
shiyanhui committed Jul 3, 2018
1 parent e1da8d8 commit 4290d84
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions krpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ func parseKey(data map[string]interface{}, key string, t string) error {
}

// parseKeys parses keys. It just wraps parseKey.
func parseKeys(data map[string]interface{}, pairs [][]string) error {
func ParseKeys(data map[string]interface{}, pairs [][]string) error {
for _, args := range pairs {
key, t := args[0], args[1]
if err := parseKey(data, key, t); err != nil {
Expand All @@ -413,7 +413,7 @@ func parseMessage(data interface{}) (map[string]interface{}, error) {
return nil, errors.New("response is not dict")
}

if err := parseKeys(
if err := ParseKeys(
response, [][]string{{"t", "string"}, {"y", "string"}}); err != nil {
return nil, err
}
Expand All @@ -427,7 +427,7 @@ func handleRequest(dht *DHT, addr *net.UDPAddr,

t := response["t"].(string)

if err := parseKeys(
if err := ParseKeys(
response, [][]string{{"q", "string"}, {"a", "map"}}); err != nil {

send(dht, addr, makeError(t, protocolError, err.Error()))
Expand Down Expand Up @@ -544,7 +544,7 @@ func handleRequest(dht *DHT, addr *net.UDPAddr,
dht.OnGetPeers(infoHash, addr.IP.String(), addr.Port)
}
case announcePeerType:
if err := parseKeys(a, [][]string{
if err := ParseKeys(a, [][]string{
{"info_hash", "string"},
{"port", "int"},
{"token", "string"}}); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions peerwire.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func getUTMetaSize(data []byte) (
return
}

if err = parseKeys(
if err = ParseKeys(
dict, [][]string{{"metadata_size", "int"}, {"m", "map"}}); err != nil {
return
}
Expand Down Expand Up @@ -318,7 +318,7 @@ func (wire *Wire) fetchMetadata(r Request) {
}
dict := d.(map[string]interface{})

if err = parseKeys(dict, [][]string{
if err = ParseKeys(dict, [][]string{
{"msg_type", "int"},
{"piece", "int"}}); err != nil {
return
Expand Down

0 comments on commit 4290d84

Please sign in to comment.