From 2a572df05cbbb3a0b0b3d0095a9af16757cbbf9f Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Fri, 10 Oct 2014 20:40:51 -0700 Subject: [PATCH] ignore trailing slashes --- codec.go | 4 ++++ multiaddr_test.go | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/codec.go b/codec.go index c797426..a6cf991 100644 --- a/codec.go +++ b/codec.go @@ -9,6 +9,10 @@ import ( ) func stringToBytes(s string) ([]byte, error) { + + // consume trailing slashes + s = strings.TrimRight(s, "/") + b := []byte{} sp := strings.Split(s, "/") diff --git a/multiaddr_test.go b/multiaddr_test.go index 12d6214..3a78204 100644 --- a/multiaddr_test.go +++ b/multiaddr_test.go @@ -18,6 +18,7 @@ func TestEqual(t *testing.T) { m1 := newMultiaddr(t, "/ip4/127.0.0.1/udp/1234") m2 := newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234") m3 := newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234") + m4 := newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234/") if m1.Equal(m2) { t.Error("should not be equal") @@ -38,6 +39,14 @@ func TestEqual(t *testing.T) { if !m1.Equal(m1) { t.Error("should be equal") } + + if !m2.Equal(m4) { + t.Error("should be equal") + } + + if !m4.Equal(m3) { + t.Error("should be equal") + } } func TestStringToBytes(t *testing.T) {