logos-messaging/go-multiaddr
1
0
Fork 0
mirror of https://github.com/logos-messaging/go-multiaddr.git synced 2026-04-20 09:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

rewrite value for protocols and add more tests

Browse Source
This commit is contained in:
Jeromy 2016-01-18 00:35:47 -08:00
parent a581da3f8f
commit ae64eb994b
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
multiaddr.go
View File

@ -117,28 +117,15 @@ func (m *multiaddr) Decapsulate(o Multiaddr) Multiaddr {
var ErrProtocolNotFound = fmt.Errorf("protocol not found in multiaddr") var ErrProtocolNotFound = fmt.Errorf("protocol not found in multiaddr")
func (m *multiaddr) ValueForProtocol(code int) (string, error) { func (m *multiaddr) ValueForProtocol(code int) (string, error) {
protos := m.Protocols() for _, sub := range Split(m) {
found := -1 p := sub.Protocols()[0]
index := 2 if p.Code == code {
for i, p := range protos {
if code == p.Code {
if p.Size == 0 { if p.Size == 0 {
return "", nil return "", nil
} }
found = i return strings.Split(sub.String(), "/")[2], nil
break
} else {
index += 2
if p.Size == 0 {
index--
}
} }
} }
if found == -1 { return "", ErrProtocolNotFound
return "", ErrProtocolNotFound
}
return strings.Split(m.String(), "/")[index], nil
} }

11
multiaddr_test.go
View File

@ -330,4 +330,15 @@ func TestGetValue(t *testing.T) {
default: default:
t.Fatalf("expected ErrProtocolNotFound but got: %s", err) t.Fatalf("expected ErrProtocolNotFound but got: %s", err)
} }
a = newMultiaddr(t, "/ip4/0.0.0.0") // only one addr
assertValueForProto(t, a, P_IP4, "0.0.0.0")
a = newMultiaddr(t, "/ip4/0.0.0.0/ip4/0.0.0.0/ip4/0.0.0.0") // same sub-addr
assertValueForProto(t, a, P_IP4, "0.0.0.0")
a = newMultiaddr(t, "/ip4/0.0.0.0/udp/12345/utp") // ending in a no-value one.
assertValueForProto(t, a, P_IP4, "0.0.0.0")
assertValueForProto(t, a, P_UDP, "12345")
assertValueForProto(t, a, P_UTP, "")
} }