Improve types of swarm, id and ping calls.

Make swarm test reliable.

Author: ianopolous

src/main/java/io/ipfs/api/IPFS.java

@@ -475,17 +475,24 @@ public List<Peer> peers() throws IOException {
                     }).collect(Collectors.toList());
         }
 
-        public Map addrs() throws IOException {
+        public Map<Multihash, List<MultiAddress>> addrs() throws IOException {
             Map m = retrieveMap("swarm/addrs?stream-channels=true");
-            return (Map<String, Object>)m.get("Addrs");
+            return ((Map<String, Object>)m.get("Addrs")).entrySet()
+                    .stream()
+                    .collect(Collectors.toMap(
+                            e -> Multihash.fromBase58(e.getKey()),
+                            e -> ((List<String>)e.getValue())
+                                    .stream()
+                                    .map(MultiAddress::new)
+                                    .collect(Collectors.toList())));
         }
 
-        public Map connect(String multiAddr) throws IOException {
+        public Map connect(MultiAddress multiAddr) throws IOException {
             Map m = retrieveMap("swarm/connect?arg="+multiAddr);
             return m;
         }
 
-        public Map disconnect(String multiAddr) throws IOException {
+        public Map disconnect(MultiAddress multiAddr) throws IOException {
             Map m = retrieveMap("swarm/disconnect?arg="+multiAddr);
             return m;
         }
@@ -527,12 +534,12 @@ public String sys() throws IOException {
         }
     }
 
-    public Map ping(String target) throws IOException {
-        return retrieveMap("ping/" + target);
+    public Map ping(Multihash target) throws IOException {
+        return retrieveMap("ping/" + target.toBase58());
     }
 
-    public Map id(String target) throws IOException {
-        return retrieveMap("id/" + target);
+    public Map id(Multihash target) throws IOException {
+        return retrieveMap("id/" + target.toBase58());
     }
 
     public Map id() throws IOException {

src/test/java/io/ipfs/api/APITest.java

@@ -657,18 +657,28 @@ public void resolveTest() throws IOException {
 
     @Test
     public void swarmTest() throws IOException {
-        String multiaddr = "/ip4/127.0.0.1/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ";
-        Map connect = ipfs.swarm.connect(multiaddr);
-        Map disconnect = ipfs.swarm.disconnect(multiaddr);
-        Map<String, Object> addrs = ipfs.swarm.addrs();
+        Map<Multihash, List<MultiAddress>> addrs = ipfs.swarm.addrs();
         if (addrs.size() > 0) {
-            boolean contacted = addrs.keySet().stream()
-                    .anyMatch(target -> {
+            boolean contacted = addrs.entrySet().stream()
+                    .anyMatch(e -> {
+                        Multihash target = e.getKey();
+                        List<MultiAddress> nodeAddrs = e.getValue();
+                        boolean contactable = nodeAddrs.stream()
+                                .anyMatch(addr -> {
+                                    try {
+                                        MultiAddress peer = new MultiAddress(addr.toString() + "/ipfs/" + target.toBase58());
+                                        Map connect = ipfs.swarm.connect(peer);
+                                        Map disconnect = ipfs.swarm.disconnect(peer);
+                                        return true;
+                                    } catch (Exception ex) {
+                                        return false;
+                                    }
+                                });
                         try {
                             Map id = ipfs.id(target);
                             Map ping = ipfs.ping(target);
-                            return true;
-                        } catch (Exception e) {
+                            return contactable;
+                        } catch (Exception ex) {
                             // not all nodes have to be contactable
                             return false;
                         }