fix: address comments

src/__tests__/disconnect.test.ts

@@ -17,8 +17,12 @@ test.beforeEach(async t => {
   t.context = await connect(process.env.LEDGER_ENV! as LedgerEnv)
 })
 
+test('after connect', async t => {
+  await t.notThrowsAsync(t.context.disconnect())
+})
+
 test('after add eth', async t => {
-  const uplink = await addEth()(t.context)
+  await addEth()(t.context)
   await t.notThrowsAsync(t.context.disconnect())
 })
 

src/config.ts

@@ -26,9 +26,9 @@ export const serializeConfig = (state: State) =>
     credentials: state.credentials.map(credentialToConfig)
   })
 
-export const persistConfig = async (fd: number, state: State) => {
-  await promisify(ftruncate)(fd) // r+ mode doesn't overwrite, so first delete file contents
-  await promisify(writeFile)(fd, serializeConfig(state))
+export const persistConfig = async (fileDescriptor: number, state: State) => {
+  await promisify(ftruncate)(fileDescriptor) // r+ mode doesn't overwrite, so first delete file contents
+  await promisify(writeFile)(fileDescriptor, serializeConfig(state))
 }
 
 /**
@@ -46,20 +46,23 @@ export const loadConfig = async (): Promise<
     else throw err
   })
 
-  const fd = await promisify(open)(CONFIG_PATH, 'r+').catch(err => {
+  const fileDescriptor = await promisify(open)(CONFIG_PATH, 'r+').catch(err => {
     if (err.code === 'ENOENT') {
       return promisify(open)(CONFIG_PATH, 'w+')
     } else {
       throw err
     }
   })
 
-  const content = await promisify(readFile)(fd, {
+  const content = await promisify(readFile)(fileDescriptor, {
     encoding: 'utf8'
   })
 
   // TODO Add *robust* schema validation
-  return [fd, content.length === 0 ? undefined : JSON.parse(content)]
+  return [
+    fileDescriptor,
+    content.length === 0 ? undefined : JSON.parse(content)
+  ]
 }
 
 /**

src/index.ts

@@ -66,7 +66,7 @@ export interface State {
 }
 
 export const connect = async (ledgerEnv: LedgerEnv = LedgerEnv.Testnet) => {
-  const [fd, config] = await loadConfig()
+  const [fileDescriptor, config] = await loadConfig()
 
   // TODO Make sure the config has the right ledgerEnv to support multiple? Idk
 
@@ -101,7 +101,10 @@ export const connect = async (ledgerEnv: LedgerEnv = LedgerEnv.Testnet) => {
       )
     : []
 
-  const saveInterval = setInterval(() => persistConfig(fd, state), 10000)
+  const saveInterval = setInterval(
+    () => persistConfig(fileDescriptor, state),
+    10000
+  )
 
   const add = async (
     credentialConfig: CredentialConfigs
@@ -168,11 +171,11 @@ export const connect = async (ledgerEnv: LedgerEnv = LedgerEnv.Testnet) => {
 
   const disconnect = async () => {
     clearInterval(saveInterval)
-    await persistConfig(fd, state)
+    await persistConfig(fileDescriptor, state)
     await Promise.all(state.uplinks.map(closeUplink))
     await Promise.all(state.credentials.map(closeCredential))
     await Promise.all(Object.values(state.settlers).map(closeEngine))
-    await promisify(close)(fd)
+    await promisify(close)(fileDescriptor)
   }
 
   // TODO Should disconnecting the API prevent other operations from occuring? (they may not work anyways)

src/settlement/machinomy.ts

@@ -82,10 +82,10 @@ export type ReadyEthereumCredential = {
 }
 
 /**
- * Ensure that the given string is begins with given prefix
+ * Ensure that the given string begins with given prefix
  * - Prefix the string if it doesn't already
  */
-const prefixWith = (prefix: string, str: string) =>
+const ensurePrefixedWith = (prefix: string, str: string) =>
   str.startsWith(prefix) ? str : prefix + str
 
 const addressFromPrivate = (privateKey: string) =>
@@ -99,8 +99,11 @@ export const setupCredential = ({
   ReadyEthereumCredential
 > => ({
   settlerType,
-  privateKey: prefixWith('0x', privateKey),
-  address: prefixWith('0x', addressFromPrivate(prefixWith('0x', privateKey)))
+  privateKey: ensurePrefixedWith('0x', privateKey),
+  address: ensurePrefixedWith(
+    '0x',
+    addressFromPrivate(ensurePrefixedWith('0x', privateKey))
+  )
 })
 
 export const uniqueId = (cred: ReadyEthereumCredential) => cred.address