Run prettier

src/helpers/utils.ts

@@ -8,10 +8,7 @@ import { PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH } from "../constants";
  * @param length
  */
 export function padLeft(source: Uint8Array, length: number): Buffer {
-  assert(
+  assert(source.length <= length, "Given array must be smaller or equal to desired array size");
-    source.length <= length,
-    "Given array must be smaller or equal to desired array size"
-  );
   const result = Buffer.alloc(length, 0);
   result.set(source, length - source.length);
   return result;

src/index.ts

@@ -47,10 +47,7 @@ export function sign(secretKey: Uint8Array, messageHash: Uint8Array): Buffer {
  * @param signatures
  */
 export function aggregateSignatures(signatures: Uint8Array[]): Buffer {
-  assert(
+  assert(signatures && signatures.length > 0, "signatures is null or undefined or empty array");
-    signatures && signatures.length > 0,
-    "signatures is null or undefined or empty array"
-  );
   return Signature.aggregate(
     signatures.map(
       (signature): Signature => {
@@ -81,11 +78,7 @@ export function aggregatePubkeys(publicKeys: Uint8Array[]): Buffer {
  * @param messageHash
  * @param signature
  */
-export function verify(
+export function verify(publicKey: Uint8Array, messageHash: Uint8Array, signature: Uint8Array): boolean {
-  publicKey: Uint8Array,
-  messageHash: Uint8Array,
-  signature: Uint8Array
-): boolean {
   assert(publicKey, "publicKey is null or undefined");
   assert(messageHash, "messageHash is null or undefined");
   assert(signature, "signature is null or undefined");
@@ -105,11 +98,7 @@ export function verify(
  * @param messageHash
  * @param signature
  */
-export function verifyAggregate(
+export function verifyAggregate(publicKeys: Uint8Array[], messageHash: Uint8Array, signature: Uint8Array): boolean {
-  publicKeys: Uint8Array[],
-  messageHash: Uint8Array,
-  signature: Uint8Array
-): boolean {
   assert(publicKeys, "publicKey is null or undefined");
   assert(messageHash, "messageHash is null or undefined");
   assert(signature, "signature is null or undefined");

src/privateKey.ts

@@ -14,10 +14,7 @@ export class PrivateKey {
   }
 
   public static fromBytes(bytes: Uint8Array): PrivateKey {
-    assert(
+    assert(bytes.length === SECRET_KEY_LENGTH, "Private key should have 32 bytes");
-      bytes.length === SECRET_KEY_LENGTH,
-      "Private key should have 32 bytes"
-    );
     const context = getContext();
     const secretKey = new context.SecretKey();
     secretKey.deserialize(Buffer.from(bytes));
@@ -26,10 +23,7 @@ export class PrivateKey {
 
   public static fromHexString(value: string): PrivateKey {
     value = value.replace("0x", "");
-    assert(
+    assert(value.length === SECRET_KEY_LENGTH * 2, "secret key must have 32 bytes");
-      value.length === SECRET_KEY_LENGTH * 2,
-      "secret key must have 32 bytes"
-    );
     const context = getContext();
     return new PrivateKey(context.deserializeHexStrToSecretKey(value));
   }

src/signature.ts

@@ -14,10 +14,7 @@ export class Signature {
   }
 
   public static fromCompressedBytes(value: Uint8Array): Signature {
-    assert(
+    assert(value.length === 2 * FP_POINT_LENGTH, `Signature must have ${2 * FP_POINT_LENGTH} bytes`);
-      value.length === 2 * FP_POINT_LENGTH,
-      `Signature must have ${2 * FP_POINT_LENGTH} bytes`
-    );
     const context = getContext();
     const signature = new context.Signature();
     if (!EMPTY_SIGNATURE.equals(value)) {
@@ -47,21 +44,14 @@ export class Signature {
     return this.value;
   }
 
-  public verifyAggregate(
+  public verifyAggregate(publicKeys: PublicKey[], message: Uint8Array): boolean {
-    publicKeys: PublicKey[],
-    message: Uint8Array
-  ): boolean {
     return this.value.fastAggregateVerify(
       publicKeys.map((key) => key.getValue()),
       message
     );
   }
 
-  public verifyMultiple(
+  public verifyMultiple(publicKeys: PublicKey[], messages: Uint8Array[], fast = false): boolean {
-    publicKeys: PublicKey[],
-    messages: Uint8Array[],
-    fast = false
-  ): boolean {
     const msgs = Buffer.concat(messages);
     if (!fast && !getContext().areAllMsgDifferent(msgs)) {
       return false;

test/spec/aggregate_sigs.test.ts

@@ -1,9 +1,6 @@
 import path from "path";
 import bls, {initBLS} from "../../src";
-import {
+import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
-  describeDirectorySpecTest,
-  InputType,
-} from "@chainsafe/lodestar-spec-test-util";
 
 interface IAggregateSigsTestCase {
   data: {
@@ -18,10 +15,7 @@ before(async function f() {
 
 describeDirectorySpecTest<IAggregateSigsTestCase, string>(
   "BLS - aggregate sigs",
-  path.join(
+  path.join(__dirname, "../../node_modules/@chainsafe/eth2-spec-tests/tests/general/phase0/bls/aggregate/small"),
-    __dirname,
-    "../../node_modules/@chainsafe/eth2-spec-tests/tests/general/phase0/bls/aggregate/small"
-  ),
   (testCase) => {
     try {
       const result = bls.aggregateSignatures(

test/spec/aggregate_sigs_verify.test.ts

@@ -1,9 +1,6 @@
 import path from "path";
 import bls, {initBLS} from "../../src";
-import {
+import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
-  describeDirectorySpecTest,
-  InputType,
-} from "@chainsafe/lodestar-spec-test-util";
 
 interface AggregateSigsVerifyTestCase {
   data: {
@@ -26,10 +23,7 @@ before(async function f() {
 
 describeDirectorySpecTest<AggregateSigsVerifyTestCase, boolean>(
   "BLS - aggregate sigs verify",
-  path.join(
+  path.join(__dirname, "../../node_modules/@chainsafe/eth2-spec-tests/tests/general/phase0/bls/aggregate_verify/small"),
-    __dirname,
-    "../../node_modules/@chainsafe/eth2-spec-tests/tests/general/phase0/bls/aggregate_verify/small"
-  ),
   (testCase) => {
     const pubkeys = testCase.data.input.pubkeys.map((pubkey) => {
       return Buffer.from(pubkey.replace("0x", ""), "hex");
@@ -37,11 +31,7 @@ describeDirectorySpecTest<AggregateSigsVerifyTestCase, boolean>(
     const messages = testCase.data.input.messages.map((msg) => {
       return Buffer.from(msg.replace("0x", ""), "hex");
     });
-    return bls.verifyMultiple(
+    return bls.verifyMultiple(pubkeys, messages, Buffer.from(testCase.data.input.signature.replace("0x", ""), "hex"));
-      pubkeys,
-      messages,
-      Buffer.from(testCase.data.input.signature.replace("0x", ""), "hex")
-    );
   },
   {
     inputTypes: {

test/spec/fast_aggregate_verify.test.ts

@@ -1,9 +1,6 @@
 import path from "path";
 import bls, {initBLS} from "../../src";
-import {
+import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
-  describeDirectorySpecTest,
-  InputType,
-} from "@chainsafe/lodestar-spec-test-util";
 
 interface AggregateSigsVerifyTestCase {
   data: {
@@ -32,9 +29,7 @@ describeDirectorySpecTest<AggregateSigsVerifyTestCase, boolean>(
   ),
   (testCase) => {
     return bls.verifyAggregate(
-      testCase.data.input.pubkeys.map((key) =>
+      testCase.data.input.pubkeys.map((key) => Buffer.from(key.replace("0x", ""), "hex")),
-        Buffer.from(key.replace("0x", ""), "hex")
-      ),
       Buffer.from(testCase.data.input.message.replace("0x", ""), "hex"),
       Buffer.from(testCase.data.input.signature.replace("0x", ""), "hex")
     );

test/spec/sign.test.ts

@@ -1,9 +1,6 @@
 import path from "path";
 import bls, {initBLS} from "../../src";
-import {
+import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
-  describeDirectorySpecTest,
-  InputType,
-} from "@chainsafe/lodestar-spec-test-util";
 
 interface ISignMessageTestCase {
   data: {
@@ -21,10 +18,7 @@ before(async function f() {
 
 describeDirectorySpecTest<ISignMessageTestCase, string>(
   "BLS - sign",
-  path.join(
+  path.join(__dirname, "../../node_modules/@chainsafe/eth2-spec-tests/tests/general/phase0/bls/sign/small"),
-    __dirname,
-    "../../node_modules/@chainsafe/eth2-spec-tests/tests/general/phase0/bls/sign/small"
-  ),
   (testCase) => {
     const signature = bls.sign(
       Buffer.from(testCase.data.input.privkey.replace("0x", ""), "hex"),

test/spec/verify.test.ts

@@ -1,9 +1,6 @@
 import path from "path";
 import bls, {initBLS} from "../../src";
-import {
+import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
-  describeDirectorySpecTest,
-  InputType,
-} from "@chainsafe/lodestar-spec-test-util";
 
 interface IVerifyTestCase {
   data: {
@@ -22,10 +19,7 @@ before(async function f() {
 
 describeDirectorySpecTest<IVerifyTestCase, boolean>(
   "BLS - verify",
-  path.join(
+  path.join(__dirname, "../../node_modules/@chainsafe/eth2-spec-tests/tests/general/phase0/bls/verify/small"),
-    __dirname,
-    "../../node_modules/@chainsafe/eth2-spec-tests/tests/general/phase0/bls/verify/small"
-  ),
   (testCase) => {
     return bls.verify(
       Buffer.from(testCase.data.input.pubkey.replace("0x", ""), "hex"),

test/unit/index.test.ts

@@ -1,11 +1,4 @@
-import bls, {
+import bls, {aggregatePubkeys, aggregateSignatures, initBLS, Keypair, verify, verifyMultiple} from "../../src";
-  aggregatePubkeys,
-  aggregateSignatures,
-  initBLS,
-  Keypair,
-  verify,
-  verifyMultiple,
-} from "../../src";
 import SHA256 from "@chainsafe/as-sha256";
 import {expect} from "chai";
 import {destroy} from "../../src/context";
@@ -31,11 +24,7 @@ describe("test bls", function () {
       const keypair = Keypair.generate();
       const messageHash = Buffer.from(SHA256.digest(Buffer.from("Test")));
       const signature = keypair.privateKey.signMessage(messageHash);
-      const result = verify(
+      const result = verify(keypair.publicKey.toBytesCompressed(), messageHash, signature.toBytesCompressed());
-        keypair.publicKey.toBytesCompressed(),
-        messageHash,
-        signature.toBytesCompressed()
-      );
       expect(result).to.be.true;
     });
 
@@ -45,54 +34,32 @@ describe("test bls", function () {
       const signature = keypair.privateKey.signMessage(messageHash);
       const pubKey = keypair.publicKey.toBytesCompressed();
       verify(pubKey, messageHash, signature.toBytesCompressed());
-      expect("0x" + pubKey.toString("hex")).to.be.equal(
+      expect("0x" + pubKey.toString("hex")).to.be.equal(keypair.publicKey.toHexString());
-        keypair.publicKey.toHexString()
-      );
     });
 
     it("should fail verify empty signature", () => {
       const keypair = Keypair.generate();
-      const messageHash2 = Buffer.from(
+      const messageHash2 = Buffer.from(SHA256.digest(Buffer.from("Test message2")));
-        SHA256.digest(Buffer.from("Test message2"))
-      );
       const signature = Buffer.alloc(96);
-      const result = verify(
+      const result = verify(keypair.publicKey.toBytesCompressed(), messageHash2, signature);
-        keypair.publicKey.toBytesCompressed(),
-        messageHash2,
-        signature
-      );
       expect(result).to.be.false;
     });
 
     it("should fail verify signature of different message", () => {
       const keypair = Keypair.generate();
-      const messageHash = Buffer.from(
+      const messageHash = Buffer.from(SHA256.digest(Buffer.from("Test message")));
-        SHA256.digest(Buffer.from("Test message"))
+      const messageHash2 = Buffer.from(SHA256.digest(Buffer.from("Test message2")));
-      );
-      const messageHash2 = Buffer.from(
-        SHA256.digest(Buffer.from("Test message2"))
-      );
       const signature = keypair.privateKey.signMessage(messageHash);
-      const result = verify(
+      const result = verify(keypair.publicKey.toBytesCompressed(), messageHash2, signature.toBytesCompressed());
-        keypair.publicKey.toBytesCompressed(),
-        messageHash2,
-        signature.toBytesCompressed()
-      );
       expect(result).to.be.false;
     });
 
     it("should fail verify signature signed by different key", () => {
       const keypair = Keypair.generate();
       const keypair2 = Keypair.generate();
-      const messageHash = Buffer.from(
+      const messageHash = Buffer.from(SHA256.digest(Buffer.from("Test message")));
-        SHA256.digest(Buffer.from("Test message"))
-      );
       const signature = keypair.privateKey.signMessage(messageHash);
-      const result = verify(
+      const result = verify(keypair2.publicKey.toBytesCompressed(), messageHash, signature.toBytesCompressed());
-        keypair2.publicKey.toBytesCompressed(),
-        messageHash,
-        signature.toBytesCompressed()
-      );
       expect(result).to.be.false;
     });
   });
@@ -131,11 +98,7 @@ describe("test bls", function () {
         signature4.toBytesCompressed(),
       ]);
 
-      const result = verifyMultiple(
+      const result = verifyMultiple([aggregatePubKey12, aggregatePubKey34], [message1, message2], aggregateSignature);
-        [aggregatePubKey12, aggregatePubKey34],
-        [message1, message2],
-        aggregateSignature
-      );
 
       expect(result).to.be.true;
     });
@@ -245,11 +208,7 @@ describe("test bls", function () {
         signature4.toBytesCompressed(),
       ]);
 
-      const result = bls.verifyMultiple(
+      const result = bls.verifyMultiple([aggregatePubKey12], [message2, message1], aggregateSignature);
-        [aggregatePubKey12],
-        [message2, message1],
-        aggregateSignature
-      );
 
       expect(result).to.be.false;
     });

test/unit/keypair.test.ts

@@ -14,9 +14,7 @@ describe("keypair", function () {
   it("should create from private and public key", () => {
     const secret = PrivateKey.random();
     const secret2 = PrivateKey.random();
-    const publicKey = PublicKey.fromBytes(
+    const publicKey = PublicKey.fromBytes(PublicKey.fromPrivateKey(secret2).toBytesCompressed());
-      PublicKey.fromPrivateKey(secret2).toBytesCompressed()
-    );
     const keypair = new Keypair(secret, publicKey);
     expect(keypair.publicKey).to.be.equal(publicKey);
     expect(keypair.privateKey).to.be.equal(secret);

test/unit/privateKey.test.ts

@@ -15,25 +15,17 @@ describe("privateKey", function () {
   it("should generate random private key", function () {
     const privateKey1 = PrivateKey.random();
     const privateKey2 = PrivateKey.random();
-    expect(privateKey1.toHexString()).to.not.be.equal(
+    expect(privateKey1.toHexString()).to.not.be.equal(privateKey2.toHexString());
-      privateKey2.toHexString()
-    );
   });
 
   it("should export private key to hex string", function () {
-    const privateKey =
+    const privateKey = "0x07656fd676da43883d163f49566c72b9cbf0a5a294f26808c807700732456da7";
-      "0x07656fd676da43883d163f49566c72b9cbf0a5a294f26808c807700732456da7";
 
-    expect(PrivateKey.fromHexString(privateKey).toHexString()).to.be.equal(
+    expect(PrivateKey.fromHexString(privateKey).toHexString()).to.be.equal(privateKey);
-      privateKey
-    );
 
-    const privateKey2 =
+    const privateKey2 = "07656fd676da43883d163f49566c72b9cbf0a5a294f26808c807700732456da7";
-      "07656fd676da43883d163f49566c72b9cbf0a5a294f26808c807700732456da7";
 
-    expect(PrivateKey.fromHexString(privateKey2).toHexString()).to.be.equal(
+    expect(PrivateKey.fromHexString(privateKey2).toHexString()).to.be.equal(privateKey);
-      privateKey
-    );
   });
 
   it("should export private key to bytes", function () {

test/unit/publicKey.test.ts

@@ -20,9 +20,7 @@ describe("public key", function () {
   it("from bytes", function () {
     const publicKey =
       "b6f21199594b56d77670564bf422cb331d5281ca2c1f9a45588a56881d8287ef8619efa6456d6cd2ef61306aa5b21311";
-    expect(
+    expect(PublicKey.fromBytes(Buffer.from(publicKey, "hex")).toHexString()).to.be.equal(`0x${publicKey}`);
-      PublicKey.fromBytes(Buffer.from(publicKey, "hex")).toHexString()
-    ).to.be.equal(`0x${publicKey}`);
   });
 
   it("from private key", function () {