refactor: rename utils to keystore loader

I suspect there is an abstraction in here. I am moving the subset of
utils out to a utils folder.

Author: kanej

v-next/hardhat-keystore/src/hook-handlers/configuration-variables.ts

@@ -4,8 +4,8 @@ import type {
   HookContext,
 } from "@ignored/hardhat-vnext/types/hooks";
 
+import { getKeystore } from "../keystores/unencrypted-keystore-loader.js";
 import get from "../tasks/get.js";
-import { getKeystore } from "../utils.js";
 
 export default async (): Promise<Partial<ConfigurationVariableHooks>> => {
   const handlers: Partial<ConfigurationVariableHooks> = {

v-next/hardhat-keystore/src/utils.ts v-next/hardhat-keystore/src/keystores/unencrypted-keystore-loader.ts

@@ -1,20 +1,19 @@
-import type { Keystore } from "./types.js";
+import type { Keystore } from "../types.js";
 
 import path from "node:path";
 
-import { HardhatPluginError } from "@ignored/hardhat-vnext-errors";
 import {
-  ensureDir,
   exists,
   readJsonFile,
   writeJsonFile,
 } from "@ignored/hardhat-vnext-utils/fs";
 import chalk from "chalk";
-import envPaths from "env-paths";
 
-import { PLUGIN_ID } from "./constants.js";
-import { io } from "./io.js";
-import { setUpPassword } from "./password-manager.js";
+import { io } from "../io.js";
+import { setUpPassword } from "../password-manager.js";
+import { assertFilePath } from "../utils/assert-file-path.js";
+import { assertKeyStore } from "../utils/assert-keystore.js";
+import { getConfigDir } from "../utils/get-config-dir.js";
 
 let keystoreCache: Keystore | undefined;
 let keystoreFilePath: string | undefined;
@@ -113,29 +112,3 @@ async function getKeystoreFilePath(): Promise<string> {
   const configDirPath = await getConfigDir();
   return path.join(configDirPath, "keystore.json");
 }
-
-function assertKeyStore(
-  keystore: Keystore | undefined,
-): asserts keystore is Keystore {
-  if (keystore === undefined) {
-    throw new HardhatPluginError(
-      PLUGIN_ID,
-      "The keystore should be available at this point!",
-    );
-  }
-}
-
-function assertFilePath(fileP: string | undefined): asserts fileP is string {
-  if (fileP === undefined) {
-    throw new HardhatPluginError(
-      PLUGIN_ID,
-      "The filePath should be available at this point!",
-    );
-  }
-}
-
-async function getConfigDir(): Promise<string> {
-  const { config } = envPaths("hardhat");
-  await ensureDir(config);
-  return config;
-}

v-next/hardhat-keystore/src/tasks/delete.ts

@@ -1,8 +1,11 @@
 import type { NewTaskActionFunction } from "@ignored/hardhat-vnext/types/tasks";
 
+import {
+  getKeystore,
+  removeKey,
+} from "../keystores/unencrypted-keystore-loader.js";
 import { isAuthorized } from "../password-manager.js";
 import { showMsgNoKeystoreSet } from "../utils/show-msg-no-keystore-set.js";
-import { getKeystore, removeKey } from "../utils.js";
 
 interface TaskDeleteArguments {
   key: string;

v-next/hardhat-keystore/src/tasks/get.ts

@@ -1,9 +1,9 @@
 import type { NewTaskActionFunction } from "@ignored/hardhat-vnext/types/tasks";
 
 import { io } from "../io.js";
+import { getKeystore } from "../keystores/unencrypted-keystore-loader.js";
 import { isAuthorized } from "../password-manager.js";
 import { showMsgNoKeystoreSet } from "../utils/show-msg-no-keystore-set.js";
-import { getKeystore } from "../utils.js";
 
 interface TaskGetArguments {
   key: string;

v-next/hardhat-keystore/src/tasks/list.ts

@@ -1,8 +1,8 @@
 import type { NewTaskActionFunction } from "@ignored/hardhat-vnext/types/tasks";
 
 import { io } from "../io.js";
+import { getKeystore } from "../keystores/unencrypted-keystore-loader.js";
 import { showMsgNoKeystoreSet } from "../utils/show-msg-no-keystore-set.js";
-import { getKeystore } from "../utils.js";
 
 const taskList: NewTaskActionFunction = async () => {
   const keystore = await getKeystore();

v-next/hardhat-keystore/src/tasks/set.ts

@@ -1,13 +1,13 @@
 import type { NewTaskActionFunction } from "@ignored/hardhat-vnext/types/tasks";
 
 import { io } from "../io.js";
-import { isAuthorized } from "../password-manager.js";
 import {
   addNewSecret,
   getKeystore,
   setupKeystore,
   validateKey,
-} from "../utils.js";
+} from "../keystores/unencrypted-keystore-loader.js";
+import { isAuthorized } from "../password-manager.js";
 
 interface TaskGetArguments {
   key: string;

v-next/hardhat-keystore/src/utils/assert-file-path.ts

@@ -0,0 +1,14 @@
+import { HardhatPluginError } from "@ignored/hardhat-vnext-errors";
+
+import { PLUGIN_ID } from "../constants.js";
+
+export function assertFilePath(
+  fileP: string | undefined,
+): asserts fileP is string {
+  if (fileP === undefined) {
+    throw new HardhatPluginError(
+      PLUGIN_ID,
+      "The filePath should be available at this point!",
+    );
+  }
+}

v-next/hardhat-keystore/src/utils/assert-keystore.ts

@@ -0,0 +1,16 @@
+import type { Keystore } from "../types.js";
+
+import { HardhatPluginError } from "@ignored/hardhat-vnext-errors";
+
+import { PLUGIN_ID } from "../constants.js";
+
+export function assertKeyStore(
+  keystore: Keystore | undefined,
+): asserts keystore is Keystore {
+  if (keystore === undefined) {
+    throw new HardhatPluginError(
+      PLUGIN_ID,
+      "The keystore should be available at this point!",
+    );
+  }
+}

v-next/hardhat-keystore/src/utils/get-config-dir.ts

@@ -0,0 +1,8 @@
+import { ensureDir } from "@ignored/hardhat-vnext-utils/fs";
+import envPaths from "env-paths";
+
+export async function getConfigDir(): Promise<string> {
+  const { config } = envPaths("hardhat");
+  await ensureDir(config);
+  return config;
+}

v-next/hardhat-keystore/test/hooks.ts

@@ -7,7 +7,7 @@ import { afterEach, before, beforeEach, describe, it } from "node:test";
 import { createHardhatRuntimeEnvironment } from "@ignored/hardhat-vnext/hre";
 
 import hardhatKeystorePlugin from "../src/index.js";
-import { setKeystoreCache } from "../src/utils.js";
+import { setKeystoreCache } from "../src/keystores/unencrypted-keystore-loader.js";
 
 import { createKeyStore, deleteKeystore } from "./helpers.js";
 

v-next/hardhat-keystore/test/tasks.ts

@@ -13,7 +13,10 @@ import chalk from "chalk";
 
 import hardhatKeystorePlugin from "../src/index.js";
 import { io } from "../src/io.js";
-import { getKeystore, setKeystoreCache } from "../src/utils.js";
+import {
+  getKeystore,
+  setKeystoreCache,
+} from "../src/keystores/unencrypted-keystore-loader.js";
 
 import {
   createKeyStore,