Remove isMemory util.

organicdesign · Mar 31, 2024 · 4c62236 · 4c62236
1 parent f9aa449
commit 4c62236
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 33 deletions.
diff --git a/packages/daemon/src/common/index.ts b/packages/daemon/src/common/index.ts
@@ -16,14 +16,14 @@ import { EntryTracker } from './entry-tracker.js'
 import { createGroups } from './groups.js'
 import handleCommands from './handle-commands.js'
 import handleEvents from './handle-events.js'
-import { Config, type Components } from './interface.js'
+import { Config, MEMORY_MAGIC, type Components } from './interface.js'
 import createLibp2p from './libp2p.js'
 import { PinManager } from './pin-manager/index.js'
 import { Sneakernet } from './sneakernet/index.js'
 import { createTick } from './tick.js'
 import type { KeyvalueDB } from '@/interface.js'
 import { createLogger } from '@/logger.js'
-import { isMemory, extendDatastore } from '@/utils.js'
+import { extendDatastore } from '@/utils.js'
 
 interface Setup {
   socket: string
@@ -45,11 +45,11 @@ export default async (settings: Partial<Setup> = {}): Promise<Components> => {
   const config = parseConfig(Config)
   const events = new EventTarget()
 
-  const datastore = isMemory(config.storage)
+  const datastore = config.storage === MEMORY_MAGIC
     ? new MemoryDatastore()
     : new FsDatastore(Path.join(config.storage, 'datastore'))
 
-  const blockstore = isMemory(config.storage)
+  const blockstore = config.storage === MEMORY_MAGIC
     ? new MemoryBlockstore()
     : new FsBlockstore(Path.join(config.storage, 'blockstore'))
 

diff --git a/packages/daemon/src/common/interface.ts b/packages/daemon/src/common/interface.ts
@@ -15,8 +15,10 @@ import type { Blockstore } from 'interface-blockstore'
 import type { Datastore } from 'interface-datastore'
 import type { Welo } from 'welo'
 
+export const MEMORY_MAGIC = ':memory:'
+
 export const Config = z.object({
-  storage: z.string().default(':memory:'),
+  storage: z.string().default(MEMORY_MAGIC),
   slots: z.number().int().min(1).max(100).default(20),
   tickInterval: z.number().default(10 * 60),
   serverMode: z.boolean().default(false),

diff --git a/packages/daemon/src/interface.ts b/packages/daemon/src/interface.ts
@@ -5,8 +5,6 @@ export interface KeyvalueDB extends Database {
   store: Keyvalue
 }
 
-export const MEMORY_MAGIC = ':memory:'
-
 export interface ModuleMethod<
   Context extends Record<string, unknown> = Record<string, unknown>
 > {

diff --git a/packages/daemon/src/utils.ts b/packages/daemon/src/utils.ts
@@ -1,7 +1,4 @@
 import { NamespaceDatastore } from 'datastore-core'
 import { type Datastore, Key } from 'interface-datastore'
-import { MEMORY_MAGIC } from './interface.js'
-
-export const isMemory = (storage?: string): boolean => storage === MEMORY_MAGIC
 
 export const extendDatastore = (datastore: Datastore, name: string): NamespaceDatastore => new NamespaceDatastore(datastore, new Key(name))
diff --git a/packages/daemon/test/utils.spec.ts b/packages/daemon/test/utils.spec.ts
@@ -2,32 +2,9 @@ import assert from 'assert/strict'
 import { MemoryBlockstore } from 'blockstore-core'
 import * as cborg from 'cborg'
 import { type CID } from 'multiformats/cid'
-import { MEMORY_MAGIC } from '../src/interface.js'
-import { isMemory } from '../src/utils.js'
 import { createDag } from './utils/dag.js'
 import { walkDag, getDagSize } from '@/modules/filesystem/utils.js'
 
-describe('isMemory', () => {
-  it('returns true if the memory magic is passed', () => {
-    assert(isMemory(MEMORY_MAGIC))
-  })
-
-  it('returns false for any other value than the memory magic', () => {
-    const values = [
-      '/my/path',
-      'my-directory',
-      ':memory',
-      'memory',
-      'memory:',
-      ':memory:/my-dir'
-    ]
-
-    for (const value of values) {
-      assert(!isMemory(value))
-    }
-  })
-})
-
 describe('cbor encoding and decoding', () => {
   const data = [
     {