refactor(bitswap) group the deferreds

License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>
test(bitswap) Close (but skip for now)

License: MIT
Signed-off-by: Brian Tiger Chow <brian@perfmode.com>