Merge pull request #16 from odisseus/p2p-fix

Added support for the /p2p protocol, which is an alias for /ipfs.
multiformats · Jun 19, 2020 · 2347e9f · 2347e9f
2 parents d28c37f + 1b2044f
commit 2347e9f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,5 @@
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk9
+  - openjdk10
+  - openjdk11
diff --git a/src/main/java/io/ipfs/multiaddr/Protocol.java b/src/main/java/io/ipfs/multiaddr/Protocol.java
@@ -23,6 +23,7 @@ enum Type {
         UTP(301, 0, "utp"),
         UDT(302, 0, "udt"),
         UNIX(400, LENGTH_PREFIXED_VAR_SIZE, "unix"),
+        P2P(421, LENGTH_PREFIXED_VAR_SIZE, "p2p"),
         IPFS(421, LENGTH_PREFIXED_VAR_SIZE, "ipfs"),
         HTTPS(443, 0, "https"),
         ONION(444, 80, "onion"),
@@ -97,6 +98,7 @@ public byte[] addressToBytes(String addr) {
                     if (x > 65535)
                         throw new IllegalStateException("Failed to parse "+type.name+" address "+addr + " (> 65535");
                     return new byte[]{(byte)(x >>8), (byte)x};
+                case P2P:
                 case IPFS: {
                     Multihash hash = Cid.decode(addr);
                     ByteArrayOutputStream bout = new ByteArrayOutputStream();

diff --git a/src/test/java/io/ipfs/api/MultiAddressTest.java b/src/test/java/io/ipfs/api/MultiAddressTest.java
@@ -81,6 +81,7 @@ public void succeeds() {
                 "/tcp/1234/https",
                 "/tcp/1234/ws",
                 "/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC/tcp/1234",
+                "/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC/tcp/1234",
                 "/ip4/127.0.0.1/udp/1234",
                 "/ip4/127.0.0.1/udp/0",
                 "/ip4/127.0.0.1/tcp/1234",