refactor: use @arkecosystem/utils through @arkecosystem/core-kernel

ArkEcosystem · Sep 29, 2019 · 6645c13 · 6645c13
1 parent b37233e
commit 6645c13
Show file tree

Hide file tree

Showing 15 changed files with 208 additions and 368 deletions.
diff --git a/__tests__/unit/core/common/__fixtures__/latest-version.ts b/__tests__/unit/core/common/__fixtures__/latest-version.ts
@@ -116,15 +116,11 @@ export const versionLatest = {
                 "@types/bip39": "^2.4.2",
                 "@types/bytebuffer": "^5.0.40",
                 "@types/cli-progress": "^1.8.1",
-                "@types/execa": "^0.9.0",
                 "@types/fast-levenshtein": "^0.0.1",
                 "@types/fs-extra": "^8.0.0",
                 "@types/got": "^9.6.1",
-                "@types/latest-version": "^4.0.1",
                 "@types/listr": "^0.14.0",
                 "@types/lodash.minby": "^4.6.6",
-                "@types/log-symbols": "^3.0.0",
-                "@types/pretty-bytes": "^5.1.0",
                 "@types/pretty-ms": "^4.0.0",
                 "@types/prompts": "^2.4.0",
                 "@types/semver": "^6.0.1",
@@ -306,15 +302,11 @@ export const versionNext = {
                 "@types/bip39": "^2.4.2",
                 "@types/bytebuffer": "^5.0.40",
                 "@types/cli-progress": "^1.8.1",
-                "@types/execa": "^0.9.0",
                 "@types/fast-levenshtein": "^0.0.1",
                 "@types/fs-extra": "^8.0.0",
                 "@types/got": "^9.6.1",
-                "@types/latest-version": "^4.0.1",
                 "@types/listr": "^0.14.0",
                 "@types/lodash.minby": "^4.6.6",
-                "@types/log-symbols": "^3.0.0",
-                "@types/pretty-bytes": "^5.1.0",
                 "@types/pretty-ms": "^4.0.0",
                 "@types/prompts": "^2.4.0",
                 "@types/semver": "^6.0.1",

diff --git a/packages/core-api/package.json b/packages/core-api/package.json
@@ -25,7 +25,6 @@
         "@arkecosystem/core-kernel": "^3.0.0-next.0",
         "@arkecosystem/core-transaction-pool": "^3.0.0-next.0",
         "@arkecosystem/crypto": "^3.0.0-next.0",
-        "@arkecosystem/utils": "^0.4.0",
         "@hapi/boom": "^7.4.3",
         "@hapi/hapi": "^18.3.2",
         "@hapi/joi": "^15.1.1",

diff --git a/packages/core-database-postgres/package.json b/packages/core-database-postgres/package.json
@@ -27,7 +27,6 @@
         "@arkecosystem/core-state": "^3.0.0-next.0",
         "@arkecosystem/core-transactions": "^3.0.0-next.0",
         "@arkecosystem/crypto": "^3.0.0-next.0",
-        "@arkecosystem/utils": "^0.4.0",
         "bluebird": "^3.5.5",
         "dayjs": "^1.8.15",
         "pg-promise": "^8.7.4",

diff --git a/packages/core-database/package.json b/packages/core-database/package.json
@@ -26,8 +26,7 @@
         "@arkecosystem/core-kernel": "^3.0.0-next.0",
         "@arkecosystem/core-state": "^3.0.0-next.0",
         "@arkecosystem/core-transactions": "^3.0.0-next.0",
-        "@arkecosystem/crypto": "^3.0.0-next.0",
-        "@arkecosystem/utils": "^0.4.0"
+        "@arkecosystem/crypto": "^3.0.0-next.0"
     },
     "engines": {
         "node": ">=10.x"

diff --git a/packages/core-database/src/repositories/utils/sort-entries.ts b/packages/core-database/src/repositories/utils/sort-entries.ts
@@ -1,6 +1,5 @@
-import { Contracts } from "@arkecosystem/core-kernel";
+import { Contracts, Utils as AppUtils } from "@arkecosystem/core-kernel";
 import { Utils } from "@arkecosystem/crypto";
-import { orderBy } from "@arkecosystem/utils";
 
 import { getProperty } from "./get-property";
 
@@ -16,5 +15,5 @@ export const sortEntries = (params: Contracts.Database.Parameters, entries: Cont
         });
     }
 
-    return orderBy(entries, [iteratee], [order as "desc" | "asc"]);
+    return AppUtils.orderBy(entries, [iteratee], [order as "desc" | "asc"]);
 };
diff --git a/packages/core-jest-matchers/package.json b/packages/core-jest-matchers/package.json
@@ -23,7 +23,6 @@
     "dependencies": {
         "@arkecosystem/core-kernel": "^3.0.0-next.0",
         "@arkecosystem/crypto": "^3.0.0-next.0",
-        "@arkecosystem/utils": "^0.4.0",
         "bip39": "^3.0.2",
         "got": "^9.6.0",
         "jest-extended": "^0.11.2",

diff --git a/packages/core-jest-matchers/src/api/block.ts b/packages/core-jest-matchers/src/api/block.ts
@@ -1,5 +1,4 @@
 import { Utils } from "@arkecosystem/core-kernel";
-import { sortBy } from "@arkecosystem/utils";
 
 export {};
 
@@ -13,7 +12,7 @@ declare global {
 }
 
 const isValidBlock = block => {
-    const allowedKeys = sortBy([
+    const allowedKeys = Utils.sortBy([
         "blockSignature",
         "createdAt",
         "generatorPublicKey",
@@ -33,7 +32,7 @@ const isValidBlock = block => {
     ]);
     const actualKeys = Object.keys(block).filter(key => allowedKeys.includes(key));
 
-    return Utils.isEqual(sortBy(actualKeys), allowedKeys);
+    return Utils.isEqual(Utils.sortBy(actualKeys), allowedKeys);
 };
 
 expect.extend({

diff --git a/packages/core-jest-matchers/src/api/peer.ts b/packages/core-jest-matchers/src/api/peer.ts
@@ -1,5 +1,4 @@
 import { Utils } from "@arkecosystem/core-kernel";
-import { sortBy } from "@arkecosystem/utils";
 
 export {};
 
@@ -13,10 +12,10 @@ declare global {
 }
 
 const isValidPeer = peer => {
-    const allowedKeys = sortBy(["ip", "port"]);
+    const allowedKeys = Utils.sortBy(["ip", "port"]);
     const actualKeys = Object.keys(peer).filter(key => allowedKeys.includes(key));
 
-    return Utils.isEqual(sortBy(actualKeys), allowedKeys);
+    return Utils.isEqual(Utils.sortBy(actualKeys), allowedKeys);
 };
 
 expect.extend({

diff --git a/packages/core-jest-matchers/src/api/transaction.ts b/packages/core-jest-matchers/src/api/transaction.ts
@@ -1,5 +1,4 @@
 import { Utils } from "@arkecosystem/core-kernel";
-import { sortBy } from "@arkecosystem/utils";
 
 export {};
 
@@ -14,7 +13,7 @@ declare global {
 expect.extend({
     toBeApiTransaction: (actual, expected) => {
         // TODO based on type
-        const allowedKeys = sortBy([
+        const allowedKeys = Utils.sortBy([
             "id",
             "blockid",
             "type",
@@ -31,7 +30,7 @@ expect.extend({
 
         return {
             message: () => `Expected ${JSON.stringify(actual)} to be a valid transaction`,
-            pass: Utils.isEqual(sortBy(actualKeys), allowedKeys),
+            pass: Utils.isEqual(Utils.sortBy(actualKeys), allowedKeys),
         };
     },
 });
diff --git a/packages/core-jest-matchers/src/models/delegate.ts b/packages/core-jest-matchers/src/models/delegate.ts
@@ -1,5 +1,4 @@
 import { Utils } from "@arkecosystem/core-kernel";
-import { sortBy } from "@arkecosystem/utils";
 
 export {};
 
@@ -15,7 +14,7 @@ expect.extend({
     toBeDelegate: actual => {
         return {
             message: () => "Expected value to be a valid delegate",
-            pass: Utils.isEqual(sortBy(Object.keys(actual)), ["address", "publicKey", "username"]),
+            pass: Utils.isEqual(Utils.sortBy(Object.keys(actual)), ["address", "publicKey", "username"]),
         };
     },
 });
diff --git a/packages/core-jest-matchers/src/models/transaction.ts b/packages/core-jest-matchers/src/models/transaction.ts
@@ -1,5 +1,4 @@
 import { Utils } from "@arkecosystem/core-kernel";
-import { sortBy } from "@arkecosystem/utils";
 
 export {};
 
@@ -14,12 +13,12 @@ declare global {
 expect.extend({
     toBeTransaction: actual => {
         // TODO based on type
-        const allowedKeys = sortBy(["id", "type", "amount", "fee", "timestamp", "signature"]);
+        const allowedKeys = Utils.sortBy(["id", "type", "amount", "fee", "timestamp", "signature"]);
         const actualKeys = Object.keys(actual).filter(key => allowedKeys.includes(key));
 
         return {
             message: () => "Expected value to be a valid transaction",
-            pass: Utils.isEqual(sortBy(actualKeys), allowedKeys),
+            pass: Utils.isEqual(Utils.sortBy(actualKeys), allowedKeys),
         };
     },
 });
diff --git a/packages/core-jest-matchers/src/models/wallet.ts b/packages/core-jest-matchers/src/models/wallet.ts
@@ -1,5 +1,4 @@
 import { Utils } from "@arkecosystem/core-kernel";
-import { sortBy } from "@arkecosystem/utils";
 
 export {};
 
@@ -15,7 +14,7 @@ expect.extend({
     toBeWallet: actual => {
         return {
             message: () => "Expected value to be a valid wallet",
-            pass: Utils.isEqual(sortBy(Object.keys(actual)), ["address", "publicKey"]),
+            pass: Utils.isEqual(Utils.sortBy(Object.keys(actual)), ["address", "publicKey"]),
         };
     },
 });
diff --git a/packages/core-p2p/src/utils/is-valid-version.ts b/packages/core-p2p/src/utils/is-valid-version.ts
@@ -15,7 +15,7 @@ export const isValidVersion = (peer: Contracts.P2P.Peer): boolean => {
     if (p2p && Array.isArray(p2p.minimumVersions) && p2p.minimumVersions.length > 0) {
         minimumVersions = p2p.minimumVersions;
     } else {
-        minimumVersions = app.get<any>("p2p.options").minimumVersions;
+        minimumVersions = app.get<{ minimumVersions: string[] }>("p2p.options").minimumVersions;
     }
 
     return minimumVersions.some((minimumVersion: string) => semver.satisfies(peer.version, minimumVersion));

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -93,14 +93,10 @@
         "@types/bip39": "^2.4.2",
         "@types/bytebuffer": "^5.0.40",
         "@types/cli-progress": "^1.8.1",
-        "@types/execa": "^2.0.0",
         "@types/fast-levenshtein": "^0.0.1",
         "@types/fs-extra": "^8.0.0",
         "@types/got": "^9.6.7",
-        "@types/latest-version": "^4.0.1",
         "@types/listr": "^0.14.2",
-        "@types/log-symbols": "^3.0.0",
-        "@types/pretty-bytes": "^5.2.0",
         "@types/prompts": "^2.4.0",
         "@types/semver": "^6.0.2",
         "@types/wif": "^2.0.1"