Type checking on u8aToU8a before invalid return (#954)

* Type checking on u8aToU8a before invalid return

* Remove extra assignment

* CHANGELOG

* Correct expectation
This commit is contained in:
Jaco
2021-04-22 10:25:22 +02:00
committed by GitHub
parent 6b705a9838
commit 132ba0128d
6 changed files with 37 additions and 23 deletions
+7
View File
@@ -55,4 +55,11 @@ describe('u8aToU8a', (): void => {
new Uint8Array([128, 0, 10])
);
});
it('fails to create from unknown typed values', (): void => {
expect(
// this is where completely invalid data is being passed
() => u8aToU8a(123 as unknown as Uint8Array)
).toThrow('Unable to convert 123 (typeof number) to a Uint8Array');
});
});
+7 -3
View File
@@ -1,10 +1,12 @@
// Copyright 2017-2021 @polkadot/util authors & contributors
// SPDX-License-Identifier: Apache-2.0
import { assert } from '../assert';
import { hexToU8a } from '../hex/toU8a';
import { isBuffer } from '../is/buffer';
import { isHex } from '../is/hex';
import { isString } from '../is/string';
import { isU8a } from '../is/u8a';
import { stringToU8a } from '../string/toU8a';
/**
@@ -29,9 +31,11 @@ export function u8aToU8a (value?: number[] | Buffer | Uint8Array | string | null
return isHex(value)
? hexToU8a(value)
: stringToU8a(value);
} else if (Array.isArray(value) || isBuffer(value)) {
return new Uint8Array(value);
}
return Array.isArray(value) || isBuffer(value)
? new Uint8Array(value)
: value;
assert(isU8a(value), `Unable to convert ${value.toString()} (typeof ${typeof value}) to a Uint8Array`);
return value;
}