Merge remote-tracking branch 'origin/master' into mpetrunic/new-spec-test-format

# Conflicts:
#	packages/bls/src/helpers/g2point.ts
This commit is contained in:
Marin Petrunić 2019-08-17 16:02:39 +02:00
commit 76be9d2507
1 changed files with 1 additions and 1 deletions

View File

@ -1,6 +1,6 @@
import {BIG} from "@chainsafe/milagro-crypto-js/src/big"; import {BIG} from "@chainsafe/milagro-crypto-js/src/big";
import {ECP2} from "@chainsafe/milagro-crypto-js/src/ecp2"; import {ECP2} from "@chainsafe/milagro-crypto-js/src/ecp2";
import {sha256} from 'js-sha256'; import { sha256 } from 'js-sha256';
import ctx from "../ctx"; import ctx from "../ctx";
import * as random from "secure-random"; import * as random from "secure-random";
import {calculateYFlag, getModulus, padLeft} from "./utils"; import {calculateYFlag, getModulus, padLeft} from "./utils";