From c28a6ee3ca4a76ec36d066d57575c8bc7b253b16 Mon Sep 17 00:00:00 2001
From: Evguenia degtiareva <jane.degtiareva@gmail.com>
Date: Tue, 7 May 2019 15:18:02 -0700
Subject: [PATCH] Keystore: switch to file system keystore from nearlib

---
 index.js                            |  2 +-
 unencrypted_file_system_keystore.js | 69 -----------------------------
 2 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 unencrypted_file_system_keystore.js

diff --git a/index.js b/index.js
index 0c70a0e4..def514f9 100755
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 const { InMemoryKeyStore, KeyPair } = require('nearlib');
 const neardev = require('nearlib/dev');
-const UnencryptedFileSystemKeyStore = require('./unencrypted_file_system_keystore');
+const UnencryptedFileSystemKeyStore = require('nearlib/signing/unencrypted_file_system_keystore');
 const fs = require('fs');
 const yargs = require('yargs');
 const ncp = require('ncp').ncp;
diff --git a/unencrypted_file_system_keystore.js b/unencrypted_file_system_keystore.js
deleted file mode 100644
index 021a12c3..00000000
--- a/unencrypted_file_system_keystore.js
+++ /dev/null
@@ -1,69 +0,0 @@
-const fs = require('fs');
-const keyDir = './neardev';
-const keyFile = 'devkey.json';
-const KeyPair = require('nearlib/signing/key_pair')
-const {promisify} = require('util');
-
-/**
- * Unencrypted file system key store.
- */
-class UnencryptedFileSystemKeyStore {
-    constructor() {}
-
-    async setKey(accountId, keypair) {
-        if (!await promisify(fs.exists)(keyDir)){
-            await promisify(fs.mkdir)(keyDir);
-        }
-        const keyFileContent = {
-            public_key: keypair.getPublicKey(),
-            secret_key: keypair.getSecretKey(),
-            account_id: accountId
-        };
-        await promisify(fs.writeFile)(this.getKeyFilePath(), JSON.stringify(keyFileContent));
-    }
-
-    async getKey(accountId) {
-        // Find keys/account id
-        if (!await promisify(fs.exists)(this.getKeyFilePath())) {
-            throw 'Key lookup failed. Please make sure you set up an account.';
-        }
-        const rawKey = await this.getRawKey();
-        if (!rawKey.public_key || !rawKey.secret_key || !rawKey.account_id) {
-            throw 'Deployment failed. neardev/devkey.json format problem. Please make sure file contains public_key, secret_key, and account_id".';
-        }
-        if (rawKey.account_id != accountId) {
-            throw 'Deployment failed. Keystore contains data for wrong account.';
-        }
-        const result = new KeyPair(rawKey.public_key, rawKey.secret_key);
-        return result;
-    }
-
-    /**
-     * Returns all account ids.
-     */
-    async getAccountIds() {
-        if (!await promisify(fs.exists)(this.getKeyFilePath())) {
-            return [];
-        }
-        const rawKey = await this.getRawKey();
-        if (!rawKey.public_key || !rawKey.secret_key || !rawKey.account_id) {
-            return [];
-        }
-        return [rawKey.account_id];
-    }
-
-    async clear() {
-        this.keys = {};
-    }
-
-    // TODO: make this configurable
-    getKeyFilePath() {
-        return keyDir + "/" + keyFile;
-    }
-
-    async getRawKey() {
-        return JSON.parse(await promisify(fs.readFile)(this.getKeyFilePath()));
-    }
-}
-
-module.exports = UnencryptedFileSystemKeyStore;
\ No newline at end of file