more work on bitswap and other code cleanup
Jeromy authored
678db4fa