Skip to content
This repository has been archived by the owner on Aug 1, 2023. It is now read-only.

Feat/circuit relay #6

Merged
merged 50 commits into from
May 28, 2018
Merged

Feat/circuit relay #6

merged 50 commits into from
May 28, 2018

Conversation

dryajov
Copy link
Member

@dryajov dryajov commented Jan 25, 2018

No description provided.

@ghost ghost assigned dryajov Jan 25, 2018
@ghost ghost added the status/in-progress In progress label Jan 25, 2018
@daviddias
Copy link
Member

@dryajov just saw that the table on -- ipfs/js-ipfs#1063 -- has been updated to:

image

This is excellent! Do we have tests in place for all of those?

@daviddias daviddias mentioned this pull request Jan 25, 2018
6 tasks
@dryajov
Copy link
Member Author

dryajov commented Jan 25, 2018

Yep, all tests are implemented, currently working to get all CIs green.

@dryajov
Copy link
Member Author

dryajov commented Feb 5, 2018

documenting CI issues here - #11

@dryajov
Copy link
Member Author

dryajov commented Feb 5, 2018

go <-> js relay <-> browser is being skipped now which is due to - ipfs/js-ipfs#1203

@dryajov dryajov mentioned this pull request Feb 13, 2018
.aegir.js Outdated
browserDisconnectTimeout: 500 * 1000,
browserNoActivityTimeout: 500 * 1000,
browserDisconnectTimeout: 5000 * 1000,
browserNoActivityTimeout: 5000 * 1000,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do the tests take so much time?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure yet - investigating.

@dryajov dryajov force-pushed the feat/circuit-relay branch 2 times, most recently from 226341e to eea5a0f Compare March 3, 2018 00:44
@JonKrone JonKrone mentioned this pull request Mar 6, 2018
2 tasks
@dryajov
Copy link
Member Author

dryajov commented Mar 7, 2018

There are two skipped tests right now browser-browser-go and go-browser-browser - I'm not sure what's going on there, but I'm looking into it. Other than that, we can merge this as it covers everything we've set out to cover.

I'll add issues to track the skipped tests.

@dryajov
Copy link
Member Author

dryajov commented Mar 7, 2018

Here is the issue documenting browser-browser-go failing - #16. The other case go-browser-browser is to be working.

@dryajov
Copy link
Member Author

dryajov commented Mar 7, 2018

@diasdavid I don't think that adding a flag (isRelay?) to PeerInfo would be the right way to go. It doesn't scale to other services and we've discussed service discovery/announcement in several places (e.g. libp2p/specs#32).

I'm going to skip opening another issue with an adhoc solution and propose that we figure out service discovery soonish. Let me know if you still want an issue to track it in this repo?

Went ahead and added an issue to track the connect timeouts - #17

@dryajov
Copy link
Member Author

dryajov commented Mar 12, 2018

Update.

The issue documented in #16 has been troubleshooted and resolved in go. We should now how %100 of our interop tests covered.

@daviddias
Copy link
Member

We should now how %100 of our interop tests covered.

Test it :)

@dryajov
Copy link
Member Author

dryajov commented Mar 14, 2018

@diasdavid

@daviddias
Copy link
Member

@dryajov I mean, you should be able to pull a custom version of go-ipfs -- https://github.com/ipfs/interop#test-with-a-non-yet-released-version-of-go-ipfs -- and verify that indeed all tests pass.

@dryajov
Copy link
Member Author

dryajov commented Mar 14, 2018

We can also create a branch in go-ipfs-dep pointing to a custom ipfs version. I believe the latest go master already has the fixes.

Here is the output from a run using the circuit fix.

Tests > interop-ipfs@0.0.0 test /Users/dryajov/personal/projects/ipfs/ipfs/interop > cross-env IPFS_REUSEPORT=false aegir test -t node -t browser --no-cors

Test Node.js

�[0m�[0m
�[0m circuit�[0m
�[0m go-go-go�[0m
�[32m ✓�[0m�[90m connect�[0m�[31m (1083ms)�[0m
�[32m ✓�[0m�[90m send�[0m
�[0m js-go-go�[0m
�[32m ✓�[0m�[90m connect�[0m�[31m (1114ms)�[0m
�[32m ✓�[0m�[90m send�[0m�[31m (169ms)�[0m
�[0m go-go-js�[0m
�[32m ✓�[0m�[90m connect�[0m�[31m (1120ms)�[0m
�[32m ✓�[0m�[90m send�[0m�[31m (272ms)�[0m
�[0m js-go-js�[0m
�[32m ✓�[0m�[90m connect�[0m�[31m (1155ms)�[0m
�[32m ✓�[0m�[90m send�[0m�[31m (426ms)�[0m
�[0m go-js-go�[0m
�[32m ✓�[0m�[90m connect�[0m�[31m (1161ms)�[0m
�[32m ✓�[0m�[90m send�[0m
�[0m js-js-go�[0m
�[32m ✓�[0m�[90m connect�[0m�[31m (1191ms)�[0m
�[32m ✓�[0m�[90m send�[0m�[31m (207ms)�[0m
�[0m go-js-js�[0m
�[32m ✓�[0m�[90m connect�[0m�[31m (1219ms)�[0m
�[32m ✓�[0m�[90m send�[0m�[31m (286ms)�[0m
�[0m js-js-js�[0m
�[32m ✓�[0m�[90m connect�[0m�[31m (1175ms)�[0m
�[32m ✓�[0m�[90m send�[0m�[31m (249ms)�[0m

�[0m repo�[0m
�[32m ✓�[0m�[90m read repo: go -> js�[0m�[31m (12191ms)�[0m
�[36m - read repo: js -> go�[0m

�[0m exchange files�[0m
�[32m ✓�[0m�[90m connect go <-> js�[0m
�[32m ✓�[0m�[90m connect js <-> js�[0m
�[0m cat file�[0m
�[32m ✓�[0m�[90m go -> js: 1.02 kB�[0m
�[32m ✓�[0m�[90m js -> go: 1.02 kB�[0m
�[32m ✓�[0m�[90m js -> js: 1.02 kB�[0m
�[32m ✓�[0m�[90m go -> js: 63.5 kB�[0m
�[32m ✓�[0m�[90m js -> go: 63.5 kB�[0m
�[32m ✓�[0m�[90m js -> js: 63.5 kB�[0m
�[32m ✓�[0m�[90m go -> js: 65.5 kB�[0m
�[32m ✓�[0m�[90m js -> go: 65.5 kB�[0m
�[32m ✓�[0m�[90m js -> js: 65.5 kB�[0m
�[32m ✓�[0m�[90m go -> js: 524 kB�[0m
�[32m ✓�[0m�[90m js -> go: 524 kB�[0m�[33m (38ms)�[0m
�[32m ✓�[0m�[90m js -> js: 524 kB�[0m
�[32m ✓�[0m�[90m go -> js: 786 kB�[0m�[33m (44ms)�[0m
�[32m ✓�[0m�[90m js -> go: 786 kB�[0m�[33m (46ms)�[0m
�[32m ✓�[0m�[90m js -> js: 786 kB�[0m�[33m (45ms)�[0m
�[32m ✓�[0m�[90m go -> js: 1.05 MB�[0m�[33m (59ms)�[0m
�[32m ✓�[0m�[90m js -> go: 1.05 MB�[0m�[33m (55ms)�[0m
�[32m ✓�[0m�[90m js -> js: 1.05 MB�[0m�[33m (59ms)�[0m
�[32m ✓�[0m�[90m go -> js: 1.05 MB�[0m�[33m (54ms)�[0m
�[32m ✓�[0m�[90m js -> go: 1.05 MB�[0m�[33m (53ms)�[0m
�[32m ✓�[0m�[90m js -> js: 1.05 MB�[0m�[33m (56ms)�[0m
�[32m ✓�[0m�[90m go -> js: 4.19 MB�[0m�[31m (242ms)�[0m
�[32m ✓�[0m�[90m js -> go: 4.19 MB�[0m�[31m (223ms)�[0m
�[32m ✓�[0m�[90m js -> js: 4.19 MB�[0m�[31m (181ms)�[0m
�[32m ✓�[0m�[90m go -> js: 8.39 MB�[0m�[31m (430ms)�[0m
�[32m ✓�[0m�[90m js -> go: 8.39 MB�[0m�[31m (403ms)�[0m
�[32m ✓�[0m�[90m js -> js: 8.39 MB�[0m�[31m (411ms)�[0m
�[0m get directory�[0m
�[32m ✓�[0m�[90m go -> js: depth: 5, num: 5�[0m�[33m (56ms)�[0m
�[32m ✓�[0m�[90m js -> go: depth: 5, num: 5�[0m
�[32m ✓�[0m�[90m js -> js: depth: 5, num: 5�[0m
�[32m ✓�[0m�[90m go -> js: depth: 5, num: 10�[0m�[33m (51ms)�[0m
�[32m ✓�[0m�[90m js -> go: depth: 5, num: 10�[0m�[33m (71ms)�[0m
�[32m ✓�[0m�[90m js -> js: depth: 5, num: 10�[0m�[33m (45ms)�[0m
�[32m ✓�[0m�[90m go -> js: depth: 5, num: 50�[0m�[31m (236ms)�[0m
�[32m ✓�[0m�[90m js -> go: depth: 5, num: 50�[0m�[31m (195ms)�[0m
�[32m ✓�[0m�[90m js -> js: depth: 5, num: 50�[0m�[31m (202ms)�[0m
�[32m ✓�[0m�[90m go -> js: depth: 5, num: 100�[0m�[31m (390ms)�[0m
�[32m ✓�[0m�[90m js -> go: depth: 5, num: 100�[0m�[31m (369ms)�[0m
�[32m ✓�[0m�[90m js -> js: depth: 5, num: 100�[0m�[31m (368ms)�[0m

�[0m kad-dht�[0m
�[0m a JS node in the land of Go�[0m
�[36m - make connections�[0m
�[36m - one hop�[0m
�[36m - two hops�[0m
�[36m - three hops�[0m

�[0m pubsub�[0m
�[32m ✓�[0m�[90m make connections�[0m�[31m (1028ms)�[0m
�[0m ascii data�[0m
�[32m ✓�[0m�[90m publish from Go, subscribe on Go�[0m�[31m (508ms)�[0m
�[32m ✓�[0m�[90m publish from JS, subscribe on JS�[0m�[31m (524ms)�[0m
�[32m ✓�[0m�[90m publish from JS, subscribe on Go�[0m�[31m (1011ms)�[0m
�[32m ✓�[0m�[90m publish from Go, subscribe on JS�[0m�[31m (1516ms)�[0m
�[0m non-ascii data�[0m
�[32m ✓�[0m�[90m publish from Go, subscribe on Go�[0m�[31m (503ms)�[0m
�[32m ✓�[0m�[90m publish from JS, subscribe on JS�[0m�[31m (511ms)�[0m
�[32m ✓�[0m�[90m publish from JS, subscribe on Go�[0m�[31m (1014ms)�[0m
�[32m ✓�[0m�[90m publish from Go, subscribe on JS�[0m�[31m (1508ms)�[0m
�[0m binary data�[0m
�[32m ✓�[0m�[90m publish from Go, subscribe on Go�[0m�[31m (1014ms)�[0m
�[32m ✓�[0m�[90m publish from Go, subscribe on JS�[0m�[31m (1012ms)�[0m
�[32m ✓�[0m�[90m publish from JS, subscribe on Go�[0m�[31m (1015ms)�[0m
�[32m ✓�[0m�[90m publish from JS, subscribe on JS�[0m�[31m (1018ms)�[0m

�[92m �[0m�[32m 71 passing�[0m�[90m (3m)�[0m
�[36m �[0m�[36m 5 pending�[0m

Test Browser

kad-dht
a JS node in the land of Go
- make connections
- one hop
- two hops
- three hops

circuit
go-go-go
✓ connect (1080ms)
✓ send (26ms)
js-go-go
✓ connect (1120ms)
✓ send (178ms)
go-go-js
✓ connect (1141ms)
✓ send (281ms)
js-go-js
✓ connect (1248ms)
✓ send (451ms)
go-js-go
✓ connect (1203ms)
✓ send (99ms)
js-js-go
✓ connect (1190ms)
✓ send (250ms)
go-js-js
✓ connect (1248ms)
✓ send (299ms)
js-js-js
✓ connect (1247ms)
✓ send (499ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmTNXUWaW3vMWzAqFcJFV1CYkjwtWE6TC5BLBRWZzdAHV2'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/0/ipfs/QmTNXUWaW3vMWzAqFcJFV1CYkjwtWE6TC5BLBRWZzdAHV2'
browser-go-js
✓ connect (1858ms)
✓ send (488ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmPWEKar6LSsJatwrLVUAQ9bKitURVstH7fypzPYhwuuvz'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/0/ipfs/QmPWEKar6LSsJatwrLVUAQ9bKitURVstH7fypzPYhwuuvz'
browser-go-go
✓ connect (1657ms)
✓ send (284ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmShCjmS1HTHSfnyRBJ3L4drsT3LrGQYJax8yTCZYayycF'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/0/ipfs/QmShCjmS1HTHSfnyRBJ3L4drsT3LrGQYJax8yTCZYayycF'
browser-js-js
✓ connect (1906ms)
✓ send (492ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmUrJXdiKCP7MkX7qsZjYJJgMChUGgy1y561bkoaWbdqF7'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/0/ipfs/QmUrJXdiKCP7MkX7qsZjYJJgMChUGgy1y561bkoaWbdqF7'
browser-js-go
✓ connect (1863ms)
✓ send (486ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmPVjvy4CrfZfeoAY7UqdBZ6ZjLnLYJWjjDfop2o45hm3o'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/0/ipfs/QmPVjvy4CrfZfeoAY7UqdBZ6ZjLnLYJWjjDfop2o45hm3o'
js-go-browser
✓ connect (1749ms)
✓ send (400ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmWkJBJxjK2u5kLuGKBC6JiXaqK3nEiJLgzNkGPCBTQutj'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/0/ipfs/QmWkJBJxjK2u5kLuGKBC6JiXaqK3nEiJLgzNkGPCBTQutj'
go-go-browser
✓ connect (1790ms)
✓ send (353ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmbGYm4B9TZk88kJyPfh832eMaq9hdujLMedbZsf6DHCr4'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/0/ipfs/QmbGYm4B9TZk88kJyPfh832eMaq9hdujLMedbZsf6DHCr4'
js-js-browser
✓ connect (1842ms)
✓ send (447ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmaeLG4DBaDJRhWuXfJ9RoQSxkvAsfwqFp493iY9qZRd9z'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/0/ipfs/QmaeLG4DBaDJRhWuXfJ9RoQSxkvAsfwqFp493iY9qZRd9z'
go-js-browser
✓ connect (1841ms)
✓ send (393ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/Qmawhv98gdanX3mwFF6bQxqVXQxGp6knfeQxixNKXTaqX5'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/Qmawhv98gdanX3mwFF6bQxqVXQxGp6knfeQxixNKXTaqX5'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/Qmawhv98gdanX3mwFF6bQxqVXQxGp6knfeQxixNKXTaqX5'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmSeWN5fADAZ25he36QoYLnVQ4okK5kaJqyFuTN5UjVd3a'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmSeWN5fADAZ25he36QoYLnVQ4okK5kaJqyFuTN5UjVd3a'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmSeWN5fADAZ25he36QoYLnVQ4okK5kaJqyFuTN5UjVd3a'
go-browser-browser
✓ connect (5554ms)
✓ send (484ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmQopKAthYiPf2ESrVUs4jpaeHkhhCb9xtUnFdNZSVUqRj'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmQopKAthYiPf2ESrVUs4jpaeHkhhCb9xtUnFdNZSVUqRj'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmQopKAthYiPf2ESrVUs4jpaeHkhhCb9xtUnFdNZSVUqRj'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmX73MHwc4oND1yz5AzvcxNsmv8f9H5Ctv9Xc3aDDE8U5h'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmX73MHwc4oND1yz5AzvcxNsmv8f9H5Ctv9Xc3aDDE8U5h'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmX73MHwc4oND1yz5AzvcxNsmv8f9H5Ctv9Xc3aDDE8U5h'
js-browser-browser
✓ connect (3309ms)
✓ send (487ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmUy3MGsT1EiofA1V8LAMyEbpqD7azGbMh8cXHybAT69fB'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmUy3MGsT1EiofA1V8LAMyEbpqD7azGbMh8cXHybAT69fB'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmUy3MGsT1EiofA1V8LAMyEbpqD7azGbMh8cXHybAT69fB'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmZaXFrGTfbHe8SVMfCnukMRMd2LsyZ3FPnyeDfAM2hmtH'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmZaXFrGTfbHe8SVMfCnukMRMd2LsyZ3FPnyeDfAM2hmtH'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmZaXFrGTfbHe8SVMfCnukMRMd2LsyZ3FPnyeDfAM2hmtH'
browser-browser-go
✓ connect (5190ms)
✓ send (369ms)
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmSnNPbf86Mux5QLLp3imy6SFFmLqFW4FxRng89jLRBXm5'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmSnNPbf86Mux5QLLp3imy6SFFmLqFW4FxRng89jLRBXm5'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmSnNPbf86Mux5QLLp3imy6SFFmLqFW4FxRng89jLRBXm5'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ipfs/QmcHDjYU4BCjZeHHK6wifEGJ1MXHRWWFeDxeNjTgk6So5a'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/p2p-circuit/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmcHDjYU4BCjZeHHK6wifEGJ1MXHRWWFeDxeNjTgk6So5a'
Chrome 64.0.3282 (Mac OS X 10.13.3) LOG: 'Swarm listening on', '/ip4/127.0.0.1/tcp/24642/ws/p2p-websocket-star/ipfs/QmcHDjYU4BCjZeHHK6wifEGJ1MXHRWWFeDxeNjTgk6So5a'
browser-browser-js
✓ connect (3225ms)
✓ send (445ms)

40 passing (6m)
4 pending

@dryajov
Copy link
Member Author

dryajov commented Mar 17, 2018

@diasdavid now that ipfs/js-ipfs#1063 is remeged, any reason to keep this open? Specially since we have #16 to track the remaining test?

@daviddias
Copy link
Member

@dryajov js-ipfs needs to be released first.

@ghost ghost assigned daviddias May 28, 2018
@daviddias
Copy link
Member

Merging these and leaving them skipped to avoid future merge conflicts. Waiting on go-ipfs 0.4.15!

@daviddias daviddias merged commit 744a9e7 into master May 28, 2018
@ghost ghost removed the status/in-progress In progress label May 28, 2018
@daviddias daviddias deleted the feat/circuit-relay branch May 28, 2018 05:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants