Bump dev (incl. lint fixes) (#304)

This commit is contained in:
Jaco Greeff
2020-04-01 18:49:49 +02:00
committed by GitHub
parent 8ed04f32cd
commit de78c703f5
37 changed files with 180 additions and 158 deletions
@@ -56,8 +56,8 @@ describe('Extension', () => {
test('pri(derivation.validate) passes for valid suri', async () => {
const result = await extension.handle('id', 'pri(derivation.validate)', {
parentAddress: address,
suri: '//path',
parentPassword: password
parentPassword: password,
suri: '//path'
}, {} as chrome.runtime.Port);
expect(result).toStrictEqual({
address: '5FP3TT3EruYBNh8YM8yoxsreMx7uZv1J1zNX7fFhoC5enwmN',
@@ -68,37 +68,37 @@ describe('Extension', () => {
test('pri(derivation.validate) throws for invalid suri', async () => {
await expect(extension.handle('id', 'pri(derivation.validate)', {
parentAddress: address,
suri: 'invalid-path',
parentPassword: password
parentPassword: password,
suri: 'invalid-path'
}, {} as chrome.runtime.Port)).rejects.toStrictEqual(new Error('"invalid-path" is not a valid derivation path'));
});
test('pri(derivation.validate) throws for invalid password', async () => {
await expect(extension.handle('id', 'pri(derivation.validate)', {
parentAddress: address,
suri: '//path',
parentPassword: 'invalid-password'
parentPassword: 'invalid-password',
suri: '//path'
}, {} as chrome.runtime.Port)).rejects.toStrictEqual(new Error('invalid password'));
});
test('pri(derivation.create) adds a derived account', async () => {
await extension.handle('id', 'pri(derivation.create)', {
parentAddress: address,
name: 'child',
suri: '//path',
parentAddress: address,
parentPassword: password,
password
password,
suri: '//path'
}, {} as chrome.runtime.Port);
expect(keyring.getAccounts()).toHaveLength(2);
});
test('pri(derivation.create) saves parent address in meta', async () => {
await extension.handle('id', 'pri(derivation.create)', {
parentAddress: address,
name: 'child',
suri: '//path',
parentAddress: address,
parentPassword: password,
password
password,
suri: '//path'
}, {} as chrome.runtime.Port);
expect(keyring.getAccount('5FP3TT3EruYBNh8YM8yoxsreMx7uZv1J1zNX7fFhoC5enwmN')?.meta.parentAddress).toEqual(address);
});
@@ -67,7 +67,7 @@ export default class Extension {
}
private accountsCreateExternal ({ address, genesisHash, name }: RequestAccountCreateExternal): boolean {
keyring.addExternal(address, { name, genesisHash });
keyring.addExternal(address, { genesisHash, name });
return true;
}
@@ -166,7 +166,7 @@ export default class Extension {
assert(queued, 'Unable to find request');
const { resolve, request } = queued;
const { request, resolve } = queued;
this.#state.saveMetadata(request);
@@ -236,7 +236,7 @@ export default class Extension {
assert(queued, 'Unable to find request');
const { request, resolve, reject } = queued;
const { reject, request, resolve } = queued;
const pair = keyring.getPair(request.inner.address);
if (!pair) {
@@ -319,7 +319,7 @@ export default class Extension {
}
}
private derivationValidate ({ parentAddress, suri, parentPassword }: RequestDeriveValidate): ResponseDeriveValidate {
private derivationValidate ({ parentAddress, parentPassword, suri }: RequestDeriveValidate): ResponseDeriveValidate {
const childPair = this.derive(parentAddress, suri, parentPassword, {});
return {
@@ -328,7 +328,7 @@ export default class Extension {
};
}
private derivationCreate ({ parentAddress, suri, parentPassword, genesisHash, name, password }: RequestDeriveCreate): boolean {
private derivationCreate ({ genesisHash, name, parentAddress, parentPassword, password, suri }: RequestDeriveCreate): boolean {
const childPair = this.derive(parentAddress, suri, parentPassword, { genesisHash, name, parentAddress });
keyring.addPair(childPair, password);
@@ -252,9 +252,9 @@ export default class State {
this.#authRequests[id] = {
id,
idStr,
reject: this.authComplete(id, reject),
request,
resolve: this.authComplete(id, resolve),
reject: this.authComplete(id, reject),
url
};
@@ -278,9 +278,9 @@ export default class State {
this.#metaRequests[id] = {
id,
reject: this.metaComplete(id, reject),
request,
resolve: this.metaComplete(id, resolve),
reject: this.metaComplete(id, reject),
url
};
@@ -382,9 +382,9 @@ export default class State {
this.#signRequests[id] = {
account,
id,
reject: this.signComplete(id, reject),
request,
resolve: this.signComplete(id, resolve),
reject: this.signComplete(id, reject),
url
};
@@ -44,7 +44,7 @@ export default function handler<TMessageType extends MessageTypes> ({ id, messag
// only send message back to port if it's still connected
if (port) {
port.postMessage({ id, error: error.message });
port.postMessage({ error: error.message, id });
}
});
}
@@ -106,7 +106,7 @@ export default class PostMessageProvider implements InjectedProvider {
return sendRequest(
'pub(rpc.subscribe)',
{ type, method, params },
{ method, params, type },
(res) => {
subscription.callback(null, res);
}
@@ -147,7 +147,7 @@ export default class PostMessageProvider implements InjectedProvider {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
public async subscribe (type: string, method: string, params: any[], callback: AnyFunction): Promise<number> {
const id = await this.send(method, params, { type, callback });
const id = await this.send(method, params, { callback, type });
return id as number;
}
+1 -1
View File
@@ -36,7 +36,7 @@ export function sendMessage<TMessageType extends MessageTypes> (message: TMessag
return new Promise((resolve, reject): void => {
const id = `${Date.now()}.${++idCounter}`;
handlers[id] = { resolve, reject, subscriber };
handlers[id] = { reject, resolve, subscriber };
const transportRequestMessage: TransportRequestMessage<TMessageType> = {
id,