Changes to the javascript-sdk-migration branch (#619)

* Account.isValidPair method used in repo * correct implementation of Account.isValidPair method * Removed unnecessary use of 'as' keyword
thenewboston-blockchain · Apr 29, 2021 · a69c023 · a69c023
1 parent 2a785d1
commit a69c023
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 31 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -158,7 +158,7 @@
     "resolve-url-loader": "^3.1.2",
     "semver": "7.3.2",
     "terser-webpack-plugin": "^4.2.3",
-    "thenewboston": "^1.1.0-alpha.3",
+    "thenewboston": "^1.1.0-alpha.4",
     "ts-pnp": "^1.2.0",
     "tweetnacl": "^1.0.3",
     "typeface-roboto": "^0.0.75",

diff --git a/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx b/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx
@@ -53,14 +53,8 @@ const AddValidatorSigningKeysModal: FC<ComponentProps> = ({close}) => {
     close();
   };
 
-  const checkPrivateSigningKey = (publicKey: string, privateKey: string): boolean => {
-    try {
-      const {accountNumberHex} = new Account(privateKey);
-      return accountNumberHex === publicKey;
-    } catch (error) {
-      return false;
-    }
-  };
+  const checkPrivateSigningKey = (publicKey: string, privateKey: string): boolean =>
+    Account.isValidPair(privateKey, publicKey);
 
   const validationSchema = useMemo(() => {
     return yup.object().shape({

diff --git a/src/renderer/dispatchers/banks.ts b/src/renderer/dispatchers/banks.ts
@@ -85,7 +85,7 @@ export const fetchBankConfig = (address: string) => async (
 ): Promise<{address: string; data?: BankConfig; error?: any}> => {
   try {
     const rawData = await new Bank(address).getConfig();
-    const data = sanitizePortFieldFromRawBankConfig(rawData as RawBankConfig);
+    const data = sanitizePortFieldFromRawBankConfig(rawData);
 
     if (data.node_type !== NodeType.bank) {
       const errorObject = {address, error: 'Node not a bank'};

diff --git a/src/renderer/dispatchers/validators.ts b/src/renderer/dispatchers/validators.ts
@@ -60,7 +60,7 @@ export const fetchValidatorConfig = (address: string) => async (
 
     const rawData = await validator.getConfig();
 
-    const data = sanitizePortFieldFromRawValidatorConfig(rawData as RawValidatorConfig);
+    const data = sanitizePortFieldFromRawValidatorConfig(rawData);
 
     if (data.node_type !== NodeType.primaryValidator && data.node_type !== NodeType.confirmationValidator) {
       const errorObject = {address, error: 'Node not a validator'};

diff --git a/src/renderer/hooks/useCleanSockets.tsx b/src/renderer/hooks/useCleanSockets.tsx
@@ -32,15 +32,13 @@ const useCleanSockets = (): void => {
         node = new Bank(address);
         const nodeConfig = await node.getConfig();
 
-        if (nodeConfig.node_type === NodeType.confirmationValidator) {
+        if (nodeConfig.node_type !== NodeType.bank) {
           node = new ConfirmationValidator(address);
         }
 
         const inCleaning = cleanSocket.clean_status === CleanStatus.cleaning;
 
-        const data = inCleaning
-          ? ((await node.stopClean(socketNetworkId)) as NodeCleanStatusWithAddress)
-          : ((await node.startClean(socketNetworkId)) as NodeCleanStatusWithAddress);
+        const data = inCleaning ? await node.stopClean(socketNetworkId) : await node.startClean(socketNetworkId);
 
         dispatch(
           updateCleanProcess({

diff --git a/src/renderer/hooks/useCrawlSockets.tsx b/src/renderer/hooks/useCrawlSockets.tsx
@@ -32,15 +32,15 @@ const useCrawlSockets = (): void => {
         node = new Bank(address);
         const nodeConfig = await node.getConfig();
 
-        if (nodeConfig.node_type === NodeType.confirmationValidator) {
+        if (nodeConfig.node_type !== NodeType.bank) {
           node = new ConfirmationValidator(address);
         }
 
         const inCrawling = crawlSocket.crawl_status === CrawlStatus.crawling;
 
         const data = inCrawling
-          ? ((await node.stopCrawl(socketNetworkKeyPair)) as NodeCrawlStatusWithAddress)
-          : ((await node.startCrawl(socketNetworkKeyPair)) as NodeCrawlStatusWithAddress);
+          ? await node.stopCrawl(socketNetworkKeyPair)
+          : await node.startCrawl(socketNetworkKeyPair);
 
         dispatch(
           updateCrawlProcess({

diff --git a/src/renderer/hooks/useNetworkCleanFetcher.tsx b/src/renderer/hooks/useNetworkCleanFetcher.tsx
@@ -53,11 +53,11 @@ const useNetworkCleanFetcher = (
         node = new Bank(address);
         const nodeConfig = await node.getConfig();
 
-        if (nodeConfig.node_type === NodeType.confirmationValidator) {
+        if (nodeConfig.node_type !== NodeType.bank) {
           node = new ConfirmationValidator(address);
         }
 
-        const data = (await node.getCleanStatus()) as NodeCleanStatusWithAddress;
+        const data = await node.getCleanStatus();
 
         setCleanStatus(data.clean_status || CleanStatus.notCleaning);
         setCleanLastCompleted(data.clean_last_completed);

diff --git a/src/renderer/hooks/useNetworkCrawlFetcher.tsx b/src/renderer/hooks/useNetworkCrawlFetcher.tsx
@@ -53,11 +53,11 @@ const useNetworkCrawlFetcher = (
         node = new Bank(address);
         const nodeConfig = await node.getConfig();
 
-        if (nodeConfig.node_type === NodeType.confirmationValidator) {
+        if (nodeConfig.node_type !== NodeType.bank) {
           node = new ConfirmationValidator(address);
         }
 
-        const data = (await node.getCrawlStatus()) as NodeCrawlStatusWithAddress;
+        const data = await node.getCrawlStatus();
 
         setCrawlStatus(data.crawl_status || CrawlStatus.notCrawling);
         setCrawlLastCompleted(data.crawl_last_completed);