feat: bitswap.wantlist peerid #1349

wraithgar · 2018-05-10T21:37:52Z

Because of the amount of work done in #1306 this PR is built off of that, that PR needs to be merged before this one can be isolated and discussed.

This adds a peerId parameter to bitswap.unwant.

Tests are in ipfs-inactive/interface-js-ipfs-core#267
API changes are in ipfs-inactive/js-ipfs-http-client#761

daviddias · 2018-05-12T17:11:10Z

test/core/bitswap.spec.js

-        })
-      })
-    })
-  })


note to self and other readers, tests were moved to ipfs-inactive/interface-js-ipfs-core#267

daviddias · 2018-05-15T16:58:01Z

Please rebase master onto this branch for green CI

wraithgar · 2018-05-15T20:42:29Z

This has been rebased w/ the version of #1306 that was rebased against master.

Tests probably won't pass without the changes to js-ipfs-api in place

alanshaw · 2018-05-25T09:17:40Z

src/core/components/bitswap.js

-    },
+      let list
+      if (peerId) {
+        peerId = PeerId.createFromB58String(peerId)


A try/catch around this will allow us to callback with an error for invalid user input.

alanshaw · 2018-05-25T09:42:12Z

src/cli/commands/block/get.js

+        process.stdout.write(block.data)
+      } else {
+        process.stderr.write('Block was unwanted before it could be remotely retrieved')
+      }


Ideally we'd use print from utils so that output can be disabled (I'm not sure why you'd want to do that for this call but we should probably support it!).

alanshaw · 2018-05-25T09:43:26Z

src/core/components/bitswap.js

      }

-      // TODO: implement when https://github.com/ipfs/js-ipfs-bitswap/pull/10 is merged
-    }
+      callback(null, self._bitswap.unwant(key))


setImmediate here too?

alanshaw · 2018-05-25T09:43:50Z

src/core/components/bitswap.js

+        list = self._bitswap.getWantlist()
+      }
+      list = formatWantlist(list)
+      callback(null, list)


setImmediate here?

alanshaw

I just noticed there's missing tests for the bitswap CLI, we need a test for wantlist with a peer and a test for unwant.

Could you also enable testing of the http interface with interface-ipfs-core by dropping a bitswap.js file in here.

Awesome work BTW 🚀

alanshaw · 2018-06-08T15:55:28Z

@wraithgar whats the status on this? Can I do to help you pull this over the line?

wraithgar · 2018-06-08T18:16:12Z

@alanshaw have this rebased against the PRs surounding #1306 and am updating it to make tests pass again. This should address some of your comments above.

wraithgar · 2018-06-08T23:00:24Z

Ok the rebase and test updates are done.

Updated original comment to link to API PR.

Still needs the CLI tests but everything else seems to be in place and working with both go (via the api tests) and js (via these tests)

wraithgar · 2018-06-11T21:29:19Z

CLI tests added and bugs found therein fixed.

alanshaw · 2018-06-14T07:51:56Z

@wraithgar there seems to be linting and build issues still with this - would you mind taking a look?

wraithgar · 2018-06-14T15:22:47Z

@alanshaw Linting errors fixed. Build errors are because this depends on the PRs in both the API and Interface.

alanshaw · 2018-06-18T16:15:29Z

@wraithgar FYI for the future, to appease the commit linter your commit message prefixes need a colon after them

Will require including the version of interface-ipfs-core that they are moved to

…peerId

License: MIT Signed-off-by: Alan Shaw <alan@tableflip.io>

alanshaw · 2018-06-20T06:28:13Z

It green!

ghost assigned wraithgar May 10, 2018

ghost added the status/in-progress In progress label May 10, 2018

daviddias reviewed May 12, 2018

View reviewed changes

wraithgar mentioned this pull request May 13, 2018

feat: Bitswap wantlist peerid ipfs-inactive/js-ipfs-http-client#761

Merged

wraithgar force-pushed the bitswap_wantlist_peerid branch from ba8c4c8 to 34d9881 Compare May 15, 2018 16:23

wraithgar force-pushed the bitswap_wantlist_peerid branch from 34d9881 to 41a0d49 Compare May 15, 2018 20:41

alanshaw suggested changes May 25, 2018

View reviewed changes

daviddias changed the title ~~Bitswap wantlist peerid~~ feat: bitswap.wantlist peerid May 29, 2018

alanshaw mentioned this pull request Jun 1, 2018

⚡️ v0.30.0 RELEASE 🚀 #1375

Closed

23 tasks

wraithgar force-pushed the bitswap_wantlist_peerid branch 2 times, most recently from 5953a59 to 371bb56 Compare June 8, 2018 22:57

wraithgar force-pushed the bitswap_wantlist_peerid branch 2 times, most recently from afc9ba3 to 2733a12 Compare June 14, 2018 15:22

wraithgar force-pushed the bitswap_wantlist_peerid branch from 2733a12 to 8be98df Compare June 14, 2018 22:10

alanshaw force-pushed the bitswap_wantlist_peerid branch from 8be98df to 0c36ab5 Compare June 18, 2018 14:31

ghost assigned alanshaw Jun 18, 2018

wraithgar added 4 commits June 18, 2018 17:45

feat(bitswap.unwant) expose bitswap.unwant to cli and http api

9262768

feat(tests) move some bitswap tests to interface

2ff6c2c

Will require including the version of interface-ipfs-core that they are moved to

feat(tests) move some bitswap tests to interface

8ddd541

Will require including the version of interface-ipfs-core that they are moved to

feat(bitswap.wantlist) add peer parameter

43c40ec

wraithgar and others added 3 commits June 18, 2018 17:45

fix(test) fix cli tests for both bitswap.unwant and bitswap.wantlist …

c99cf1f

…peerId

fix: pick peer property from querystring, fix tests

e929da1

License: MIT Signed-off-by: Alan Shaw <alan@tableflip.io>

chore: update interface-ipfs-core dependency

d5346cd

License: MIT Signed-off-by: Alan Shaw <alan@tableflip.io>

alanshaw force-pushed the bitswap_wantlist_peerid branch from 1e9dc25 to d5346cd Compare June 18, 2018 16:46

wraithgar and others added 3 commits June 19, 2018 09:52

fix: don't add newline to cli block.get output

9e09073

chore: increase timeout for bitswap cli test setup

884d37b

License: MIT Signed-off-by: Alan Shaw <alan@tableflip.io>

chore: update interface-ipfs-core dependency

ec8ee4e

License: MIT Signed-off-by: Alan Shaw <alan@tableflip.io>

alanshaw merged commit 45b705d into master Jun 20, 2018

ghost removed the status/in-progress In progress label Jun 20, 2018

alanshaw deleted the bitswap_wantlist_peerid branch June 20, 2018 06:28

alanshaw mentioned this pull request Jun 20, 2018

feat(bitswap.unwant) expose bitswap.unwant to cli and http api #1306

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: bitswap.wantlist peerid #1349

feat: bitswap.wantlist peerid #1349

wraithgar commented May 10, 2018 •

edited

Loading

daviddias May 12, 2018 •

edited

Loading

daviddias commented May 15, 2018

wraithgar commented May 15, 2018

alanshaw May 25, 2018

alanshaw May 25, 2018

alanshaw May 25, 2018

alanshaw May 25, 2018

alanshaw left a comment

alanshaw commented Jun 8, 2018

wraithgar commented Jun 8, 2018

wraithgar commented Jun 8, 2018

wraithgar commented Jun 11, 2018

alanshaw commented Jun 14, 2018

wraithgar commented Jun 14, 2018

alanshaw commented Jun 18, 2018

alanshaw commented Jun 20, 2018

feat: bitswap.wantlist peerid #1349

feat: bitswap.wantlist peerid #1349

Conversation

wraithgar commented May 10, 2018 • edited Loading

daviddias May 12, 2018 • edited Loading

Choose a reason for hiding this comment

daviddias commented May 15, 2018

wraithgar commented May 15, 2018

alanshaw May 25, 2018

Choose a reason for hiding this comment

alanshaw May 25, 2018

Choose a reason for hiding this comment

alanshaw May 25, 2018

Choose a reason for hiding this comment

alanshaw May 25, 2018

Choose a reason for hiding this comment

alanshaw left a comment

Choose a reason for hiding this comment

alanshaw commented Jun 8, 2018

wraithgar commented Jun 8, 2018

wraithgar commented Jun 8, 2018

wraithgar commented Jun 11, 2018

alanshaw commented Jun 14, 2018

wraithgar commented Jun 14, 2018

alanshaw commented Jun 18, 2018

alanshaw commented Jun 20, 2018

wraithgar commented May 10, 2018 •

edited

Loading

daviddias May 12, 2018 •

edited

Loading