feat: adding circuit addresses #14
Conversation
test/index.spec.js
Outdated
| '/p2p-circuit/ip4/1.2.3.4/tcp/3456/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4', | ||
| '/p2p-circuit/ip4/127.0.0.1/tcp/4002/ipfs/QmddWMcQX6orJGHpETYMyPgXrCXCtYANMFVDCvhKoDwLqA', | ||
| '/p2p-circuit/ipfs/QmddWMcQX6orJGHpETYMyPgXrCXCtYANMFVDCvhKoDwLqA' | ||
| ] |
There was a problem hiding this comment.
it would be good to add some bad cases as well
There was a problem hiding this comment.
gonna add those shortly.
|
@dignifiedquire @diasdavid @whyrusleeping I've added support for nested/recursive addresses, as in /p2p-circuit/ipfs/QmOne/p2p-circuit/ipfs/QmTwo, etc... |
|
|
||
| const Circuit = CircuitRecursive() | ||
|
|
||
| const IPFS = or( |
There was a problem hiding this comment.
For reference on circuit addresses take a look at - https://github.com/libp2p/specs/tree/master/relay#addressing. The above seems to take care of most of the cases, but it hasn't been cleaned up, I'll try to do it once I've got everything ironed out.
| base('p2p-circuit') | ||
| ) | ||
|
|
||
| const CircuitRecursive = () => or( |
There was a problem hiding this comment.
Doesn't need to be a function
There was a problem hiding this comment.
Mm, that's just to make it recursive, the idea is that if a function is encountered during n match, it will be called, which will expand into addidional match conditions.
There was a problem hiding this comment.
One more thing, the reason it has to be a function, is because I can reference variables that haven't finished being declared yet... I.e. I can reference circuit from it's own declaration block.
There was a problem hiding this comment.
I think I know what your talking about, we can just do () => Circuit when we need recursivity there.
| @@ -166,6 +183,10 @@ describe('multiaddr validation', function () { | |||
| assertMismatches(mafmt.WebRTCDirect, goodIP, goodUDP, badWS) | |||
| }) | |||
|
|
|||
| it('Circuit validation', function () { | |||
| assertMatches(mafmt.Circuit, goodCircuit) | |||
There was a problem hiding this comment.
Should have tests for mismatches as well.
|
Yep, those are coming shortly. |
| '/p2p-circuit/ip4/127.0.0.1/tcp/4002/ipfs/QmddWMcQX6orJGHpETYMyPgXrCXCtYANMFVDCvhKoDwLqA', | ||
| '/p2p-circuit/ipfs/QmddWMcQX6orJGHpETYMyPgXrCXCtYANMFVDCvhKoDwLqA', | ||
| '/p2p-circuit/ip4/127.0.0.1/tcp/20008/ws/ipfs/QmUjNmr8TgJCn1Ao7DvMy4cjoZU15b9bwSCBLE3vwXiwgj/' + | ||
| 'p2p-circuit/ipfs/QmUjNmr8TgJCn1Ao7DvMy4cjoZU15b9bwSCBLE3vwXiwgj' |
There was a problem hiding this comment.
@whyrusleeping check this examples, @dryajov pretty much covered them all from @lgierth notes.
|
@diasdavid we should have some bad cases in there now. |
My attempt at implementing the p2p-circuit addresses, please review. This is still using the /ipfs instead of the /p2p id.
@whyrusleeping @diasdavid @dignifiedquire @lgierth
needs multiformats/js-multiaddr#41