fixed a false wpositive with register test

entropyxyz · Jul 11, 2024 · 19c84c0 · 19c84c0
1 parent bce1135
commit 19c84c0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/flows/register/index.ts b/src/flows/register/index.ts
@@ -1,6 +1,4 @@
 // import inquirer from "inquirer"
-// @ts-ignore
-import { ChildKey } from '@entropyxyz/sdk/keys'
 import { getSelectedAccount, print, /*accountChoices*/ } from "../../common/utils"
 import { initializeEntropy } from "../../common/initializeEntropy"
 import { EntropyLogger } from "src/common/logger";
@@ -25,8 +23,9 @@ export async function entropyRegister (storedConfig, options, logger: EntropyLog
   //   // Setting default to default key proxy program
   //   default: '0x0000000000000000000000000000000000000000000000000000000000000000'
   // }])
-
-  logger.debug('about to register selectedAccount.address' +  selectedAccount.address + 'keyring:' + entropy.keyring.getLazyLoadAccountProxy(ChildKey.registration).pair.address, FLOW_CONTEXT)
+  // @ts-expect-error: Expecting error here as method expects typeof ChildKey enum from sdk
+  // export from sdk is not working as intended currently
+  logger.debug('about to register selectedAccount.address' +  selectedAccount.address + 'keyring:' + entropy.keyring.getLazyLoadAccountProxy('registration').pair.address, FLOW_CONTEXT)
   print("Attempting to register the address:", selectedAccount.address, )
 
   try {

diff --git a/src/flows/register/register.ts b/src/flows/register/register.ts
@@ -5,14 +5,14 @@ import { print } from "src/common/utils";
 export async function register (entropy: Entropy, params?: RegsiterParams): Promise<string> {
   let verifyingKey: string
   try {
-    const registerParams = params.programModAddress && params.programData ? { programDeployer: params.programModAddress, programData: params.programData } : undefined
+    const registerParams = params?.programModAddress && params?.programData ? { programDeployer: params.programModAddress, programData: params.programData } : undefined
+
     verifyingKey = await entropy.register(registerParams)
     return verifyingKey
   } catch (error) {
     if (!verifyingKey) {
-      // logger.debug('Pruning Registration', FLOW_CONTEXT)
       try {
-        const tx = await entropy.substrate.tx.registry.pruneRegistration()
+        const tx = entropy.substrate.tx.registry.pruneRegistration()
         await tx.signAndSend(entropy.keyring.accounts.registration.pair, ({ status }) => {
           if (status.isFinalized) {
             print('Successfully pruned registration');
@@ -22,8 +22,7 @@ export async function register (entropy: Entropy, params?: RegsiterParams): Prom
         console.error('Unable to prune registration due to:', error.message);
         throw error
       }
-    } else {
-      throw error
     }
+    throw error
   }
 }
diff --git a/tests/register.test.ts b/tests/register.test.ts
@@ -1,13 +1,14 @@
 import test from 'tape'
 
 import { charlieStashSeed, setupTest } from './testing-utils'
+import { register } from 'src/flows/register/register'
 
 const networkType = 'two-nodes'
 
 test('Regsiter - Default Program', async (t) => {
   const { run, entropy } = await setupTest(t, { networkType, seed: charlieStashSeed })
 
-  const verifyingKey = await run('register account', entropy.register())
+  const verifyingKey = await run('register account', register(entropy))
 
   const fullAccount = entropy.keyring.getAccount()