Add string support for multiaddr:protocols

helium · Aug 22, 2018 · 9bf2369 · 9bf2369
1 parent 061d781
commit 9bf2369
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/multiaddr.erl b/src/multiaddr.erl
@@ -52,7 +52,7 @@ to_string(Protocols) when is_list(Protocols) ->
         throw:{error, _} -> error(bad_arg)
     end.
 
--spec protocols(multiaddr()) -> [protocol()].
+-spec protocols(multiaddr() | string()) -> [protocol()].
 protocols(Addr) ->
     try
         protocols(Addr, [])
@@ -62,7 +62,7 @@ protocols(Addr) ->
 
 protocols(<<>>, Acc) ->
     Acc;
-protocols(Bytes, Acc) ->
+protocols(Bytes, Acc) when is_binary(Bytes) ->
     {Code, Tail} = small_ints:decode_varint(Bytes),
     case maddr_protocol:for_code(Code) of
 
@@ -84,7 +84,10 @@ protocols(Bytes, Acc) ->
             [{Name, undefined} | protocols(Tail, Acc)];
         {error, Error} ->
             throw({error, Error})
-    end.
+    end;
+protocols(Str, Acc) ->
+    protocols(multiaddr:new(Str), Acc).
+
 
 encode_string([], Acc) ->
     Acc;

diff --git a/test/multiaddr_test.erl b/test/multiaddr_test.erl
@@ -99,6 +99,7 @@ encode_binary_test() ->
 protocols_test() ->
     Address = multiaddr:new("/ip4/127.0.0.1/udp/1234"),
     Protocols = multiaddr:protocols(Address),
+    ?assertEqual(Protocols, multiaddr:protocols("/ip4/127.0.0.1/udp/1234")),
     ?assertEqual(2, length(Protocols)),
     ?assertMatch([{"ip4", "127.0.0.1"}, {"udp", "1234"}], Protocols),
     ?assertEqual(Address, multiaddr:new(multiaddr:to_string(Protocols))).