chore: apply suggestions from code review

Co-authored-by: Russell Dempsey <[email protected]>

packages/interface/src/blocks.ts

@@ -64,8 +64,6 @@ ProgressOptions<DeleteBlockProgressEvents>, ProgressOptions<DeleteManyBlocksProg
    * Any blocks written to the blockstore as part of the session will propagate
    * to the blockstore the session was created from.
    *
-   * This method is optional to maintain compatibility with existing
-   * blockstores that do not support sessions.
    */
   createSession(root: CID, options?: CreateSessionOptions<GetBlockProgressEvents>): Promise<Blockstore>
 }
@@ -110,7 +108,7 @@ export interface CreateSessionOptions <ProgressEvents extends ProgressEvent<any,
    *
    * @default 5
    */
-  queryConcurrency?: number
+  providerQueryConcurrency?: number
 
   /**
    * How long each queried provider has to respond either that they have the
@@ -140,5 +138,5 @@ export interface BlockBroker<RetrieveProgressEvents extends ProgressEvent<any, a
 
 export const DEFAULT_SESSION_MIN_PROVIDERS = 1
 export const DEFAULT_SESSION_MAX_PROVIDERS = 5
-export const DEFAULT_SESSION_QUERY_CONCURRENCY = 5
+export const DEFAULT_SESSION_PROVIDER_QUERY_CONCURRENCY = 5
 export const DEFAULT_SESSION_PROVIDER_QUERY_TIMEOUT = 5000

packages/utils/src/utils/networked-storage.ts

@@ -217,6 +217,9 @@ export class NetworkedStorage implements Blocks, Startable {
   }
 }
 
+function isRetrievingBlockBroker (broker: BlockBroker): broker is Required<Pick<BlockBroker, 'retrieve'>> {
+  return typeof broker.retrieve === 'function'
+}
 export const getCidBlockVerifierFunction = (cid: CID, hasher: MultihashHasher): Required<BlockRetrievalOptions>['validateFn'] => {
   if (hasher == null) {
     throw new CodeError(`No hasher configured for multihash code 0x${cid.multihash.code.toString(16)}, please configure one. You can look up which hash this is at https://github.com/multiformats/multicodec/blob/master/table.csv`, 'ERR_UNKNOWN_HASH_ALG')
@@ -246,9 +249,7 @@ async function raceBlockRetrievers (cid: CID, blockBrokers: BlockBroker[], hashe
   const retrievers: Array<Required<Pick<BlockBroker, 'retrieve'>>> = []
 
   for (const broker of blockBrokers) {
-    if (broker.retrieve != null) {
-      // @ts-expect-error retrieve may be undefined even though we've just
-      // checked that it isn't
+    if (isRetrievingBlockBroker(broker)) {
       retrievers.push(broker)
     }
   }