Skip to content

Commit 94ac63d

Browse files
committed
fix: tests to use new deriveKeypair function
1 parent 9a3e2c2 commit 94ac63d

File tree

3 files changed

+6
-19
lines changed

3 files changed

+6
-19
lines changed

packages/registrar_client/tests/integration_tests/account.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import { describe, test, expect } from "@jest/globals";
22
import { RegistrarClient } from "../../src/client/client";
33
import { UpdateAccountRequest } from "../../src/types/account";
44
import {generateMnemonic} from "bip39";
5+
import { deriveKeyPair } from "../../src/utils";
56

67
import config from "../config.json";
7-
import { derivePublicKey, generateRandomSeed } from "../utils";
8+
import { generateRandomSeed } from "../utils";
89
describe("test account module", () => {
910
const mnemonic = generateMnemonic();
1011

@@ -32,7 +33,8 @@ describe("test account module", () => {
3233
});
3334

3435
test("get account by public key", async () => {
35-
const publicKey = await derivePublicKey(mnemonic);
36+
const keyPair = await deriveKeyPair(mnemonic, "sr25519");
37+
const publicKey = Buffer.from(keyPair.publicKey).toString("base64");
3638
const account = await client.accounts.getAccountByPublicKey(publicKey);
3739
expect(account).not.toBeNull();
3840
});

packages/registrar_client/tests/integration_tests/node.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ describe("test node module", () => {
7272
dummyNode.twin_id = twinID;
7373
dummyNode.farm_id = 9999999999999;
7474
await expect(client.nodes.registerNode(dummyNode as NodeRegistrationRequest)).rejects.toThrowError(
75-
"Failed to register node: 400 Bad Request",
75+
"Failed to register node: 500 Internal Server Error",
7676
);
7777
});
7878

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
1-
import {randomBytes, sign} from 'tweetnacl';
2-
import { validateMnemonic, mnemonicToSeed } from 'bip39';
1+
import {randomBytes} from 'tweetnacl';
32

43

5-
export async function derivePublicKey(mnemonicOrSeed: string) : Promise<string> {
6-
let seed: Buffer;
7-
if (validateMnemonic(mnemonicOrSeed)) {
8-
seed = (await mnemonicToSeed(mnemonicOrSeed)).subarray(0, 32);
9-
} else if (mnemonicOrSeed.startsWith('0x')) {
10-
seed = Buffer.from(mnemonicOrSeed.slice(2), 'hex');
11-
}
12-
else {
13-
throw new Error('Invalid seed or mnemonic');
14-
}
15-
const keyPair = sign.keyPair.fromSeed(seed);
16-
return Buffer.from(keyPair.publicKey).toString('base64');
17-
}
18-
194
export function generateRandomSeed(): string {
205
return Buffer.from(randomBytes(32)).toString('hex');
216
}

0 commit comments

Comments
 (0)