update: reckless push to master for rename

Signed-off-by: Carson Farmer <carson.farmer@gmail.com>

CODEOWNERS

@@ -1 +1 @@
-*      @carsonfarmer
+*      @sanderpick @asutula @carsonfarmer @andrewxhill @jsign

src/blockstore/index.ts

@@ -34,12 +34,12 @@ export const keyToCid = (key: Key) => {
 }
 
 /**
- * Blockstore defines a simple key/value store for storing and retrieving blocks of data.
+ * BlockStore defines a simple key/value store for storing and retrieving blocks of data.
  * It nearly implements the IPFS `datastore` interface, but is specific to storage of immutable blocks of data.
  */
-export class Blockstore {
+export class BlockStore {
   /**
-   * `constructor` creates a new Blockstore.
+   * `constructor` creates a new BlockStore.
    * @param store The underlying datastore for locally caching immutable blocks of data.
    */
   constructor(private store: Datastore) {}

src/index.ts

@@ -2,7 +2,10 @@ import Libp2p from 'libp2p'
 import Bitswap from 'ipfs-bitswap'
 import Ipld from 'ipld'
 import { BlockService } from './blockservice'
-import { Blockstore } from './blockstore'
+import { BlockStore } from './blockstore'
+
+export { BlockService } from './blockservice'
+export { BlockStore, Block } from './blockstore'
 
 // Options wraps configuration options for the Peer.
 export interface Options {
@@ -17,7 +20,7 @@ export class Peer extends Ipld {
   // Ipld makes us a "DAG service"
   public config: Options
   public host: Libp2p
-  public store: Blockstore
+  public store: BlockStore
   private blockService: BlockService
   private blockExchange: Bitswap
   // reprovider: Reprovider
@@ -27,7 +30,7 @@ export class Peer extends Ipld {
   /**
    * Initialize an IPFS-Lite Peer
    */
-  constructor(store: Blockstore, host: Libp2p, config: Options = { offline: false }) {
+  constructor(store: BlockStore, host: Libp2p, config: Options = { offline: false }) {
     const blockExchange = new Bitswap(host, store)
     const blockService = new BlockService(store, config.offline ? undefined : blockExchange)
     super({ blockService })

tests/blockservice.test.ts

@@ -4,11 +4,11 @@ import { collect } from 'streaming-iterables'
 import Bitswap from 'ipfs-bitswap'
 import { MemoryDatastore } from 'interface-datastore'
 import { BlockService } from '../src/blockservice'
-import { Blockstore, Block } from '../src/blockstore'
+import { BlockStore, Block } from '../src/blockstore'
 
 let bs: BlockService
 let testBlocks: Block[]
-const store = new Blockstore(new MemoryDatastore())
+const store = new BlockStore(new MemoryDatastore())
 
 beforeAll(async () => {
   bs = new BlockService(store)

tests/blockstore.test.ts

@@ -2,9 +2,9 @@ import CID from 'cids'
 import { Key, MemoryDatastore, Query } from 'interface-datastore'
 import multihashing from 'multihashing-async'
 import { collect } from 'streaming-iterables'
-import { cidToKey, keyToCid, Block, Blockstore } from '../src/blockstore'
+import { cidToKey, keyToCid, Block, BlockStore } from '../src/blockstore'
 
-let blocks: Blockstore
+let blocks: BlockStore
 
 class ExplodingStore {
   commitInvoked: boolean
@@ -51,7 +51,7 @@ class ExplodingStore {
 }
 
 beforeAll(async () => {
-  blocks = new Blockstore(new MemoryDatastore())
+  blocks = new BlockStore(new MemoryDatastore())
 })
 
 describe('blockstore', () => {
@@ -75,7 +75,7 @@ describe('blockstore', () => {
   })
 
   describe('.put', () => {
-    let other: Blockstore
+    let other: BlockStore
 
     it('simple', async () => {
       await blocks.put(b)
@@ -125,7 +125,7 @@ describe('blockstore', () => {
       const hash = await multihashing(data, 'sha2-256')
       const cid = new CID(hash)
       const store = new ExplodingStore()
-      other = new Blockstore(store)
+      other = new BlockStore(store)
 
       await other.putMany([
         {
@@ -149,7 +149,7 @@ describe('blockstore', () => {
   })
 
   describe('.get', () => {
-    let other: Blockstore
+    let other: BlockStore
 
     it('simple', async () => {
       const block = await blocks.get(b.cid)
@@ -218,7 +218,7 @@ describe('blockstore', () => {
       const data = Buffer.from(`TEST${Date.now()}`)
       const hash = await multihashing(data, 'sha2-256')
       const cid = new CID(hash)
-      const other = new Blockstore(new ExplodingStore())
+      const other = new BlockStore(new ExplodingStore())
       await expect(other.get(cid)).rejects.toThrow('error')
     })
   })

tests/dagpair.test.ts

@@ -1,6 +1,6 @@
 import { MemoryDatastore } from 'interface-datastore'
 import { Peer } from '../src'
-import { Blockstore } from '../src/blockstore'
+import { BlockStore } from '../src/blockstore'
 import { setupLibP2PHost } from './utils'
 
 const writeKey = require('libp2p/src/pnet').generate
@@ -17,8 +17,8 @@ let p2: Peer
 describe('sync IPLD DAG between IPFS lite peers', () => {
   beforeAll(async () => {
     jest.setTimeout(20000)
-    p1 = new Peer(new Blockstore(new MemoryDatastore()), await setupLibP2PHost(undefined, swarmKey))
-    p2 = new Peer(new Blockstore(new MemoryDatastore()), await setupLibP2PHost(undefined, swarmKey))
+    p1 = new Peer(new BlockStore(new MemoryDatastore()), await setupLibP2PHost(undefined, swarmKey))
+    p2 = new Peer(new BlockStore(new MemoryDatastore()), await setupLibP2PHost(undefined, swarmKey))
     await p1.start()
     await p2.start()
     await sleep(500)

tests/files.test.ts

@@ -3,7 +3,7 @@ import { MemoryDatastore } from 'interface-datastore'
 import exporter from 'ipfs-unixfs-exporter'
 import importer from 'ipfs-unixfs-importer'
 import { Peer } from '../src'
-import { Blockstore } from '../src/blockstore'
+import { BlockStore } from '../src/blockstore'
 import { setupLibP2PHost } from './utils'
 
 const sleep = (ms: number) => new Promise(r => setTimeout(r, ms))
@@ -12,14 +12,15 @@ const results: any[] = []
 
 describe('getting and putting files', () => {
   beforeAll(async () => {
-    const bs = new Blockstore(new MemoryDatastore())
+    const bs = new BlockStore(new MemoryDatastore())
     const host = await setupLibP2PHost(undefined, undefined, ['/ip4/0.0.0.0/tcp/4004'])
     lite = new Peer(bs, host)
     await lite.start()
     await sleep(500)
   })
   afterAll(async () => {
     await lite.stop()
+    await fs.unlink('bar.txt')
   })
 
   it('read file from disc and put to "network"', async () => {

tests/helloworld.test.ts

@@ -1,15 +1,15 @@
 import { MemoryDatastore } from 'interface-datastore'
 import CID from 'cids'
 import { Peer } from '../src'
-import { Blockstore } from '../src/blockstore'
+import { BlockStore } from '../src/blockstore'
 import { setupLibP2PHost } from './utils'
 
 const sleep = (ms: number) => new Promise(r => setTimeout(r, ms))
 let lite: Peer
 
 describe.skip('fetching IPLD dag from network', () => {
   beforeAll(async () => {
-    const bs = new Blockstore(new MemoryDatastore())
+    const bs = new BlockStore(new MemoryDatastore())
     const host = await setupLibP2PHost(undefined, undefined, ['/ip4/0.0.0.0/tcp/4005'])
     lite = new Peer(bs, host)
     await lite.start()