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

WIP - Feat/circuit interop #81

Merged
merged 3 commits into from
Oct 13, 2017
Merged

WIP - Feat/circuit interop #81

merged 3 commits into from
Oct 13, 2017

Conversation

dryajov
Copy link
Member

@dryajov dryajov commented Aug 3, 2017

This depends on mafmt PR - multiformats/js-mafmt#16

@RichardLitt RichardLitt added the status/in-progress In progress label Aug 3, 2017
@dryajov dryajov requested review from daviddias and a team August 3, 2017 21:43
@daviddias daviddias mentioned this pull request Aug 3, 2017
53 tasks
@dryajov dryajov requested review from whyrusleeping and dignifiedquire and removed request for a team August 16, 2017 02:21
@dryajov dryajov mentioned this pull request Aug 16, 2017
48 tasks
@dryajov dryajov changed the title Feat/circuit interop WIP - Feat/circuit interop Aug 29, 2017
Copy link
Member

@daviddias daviddias left a comment

Choose a reason for hiding this comment

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

LGTM, needs CI to pass which requires a release of mafmt

@dryajov dryajov closed this Sep 14, 2017
@dryajov dryajov removed the status/in-progress In progress label Sep 14, 2017
@dryajov dryajov reopened this Sep 14, 2017
@dryajov dryajov added the status/in-progress In progress label Sep 14, 2017
@dryajov dryajov closed this Sep 14, 2017
@dryajov dryajov removed the status/in-progress In progress label Sep 14, 2017
@dryajov dryajov reopened this Sep 14, 2017
@dryajov dryajov added the status/in-progress In progress label Sep 14, 2017
src/index.js Outdated
@@ -68,9 +67,6 @@ class TCP {
multiaddrs = [multiaddrs]
}
return multiaddrs.filter((ma) => {
if (includes(ma.protoNames(), 'ipfs')) {
ma = ma.decapsulate('ipfs')
}
return mafmt.TCP.matches(ma)
Copy link
Member

Choose a reason for hiding this comment

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

Notes from the call today:

It should continue to be valid to pass an ipfs multiaddr, it just needs to check things differently.

    1. check if it is relay, if it is, skip it
    1. if not relay, check if it is ipfs, if it is, decapsulate
    1. check if it is TCP, if it is, include it

Copy link
Member Author

Choose a reason for hiding this comment

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

@diasdavid ii and iii already happen in master, so it should be adding a check for circuit and skipping it if its present (i).

@daviddias daviddias merged commit 11c4f45 into master Oct 13, 2017
@ghost ghost removed the status/in-progress In progress label Oct 13, 2017
@daviddias daviddias deleted the feat/circuit-interop branch October 13, 2017 15:13
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