Merge branch 'morrigan/fix-interop' into revert-51-remove-bcrypto-dependency

# Conflicts:
#	package.json
#	src/@types/basic.ts
#	src/handshakes/ik.ts
#	src/handshakes/xx.ts
#	yarn.lock
This commit is contained in:
morrigan
2020-04-22 19:07:03 +02:00
11 changed files with 90 additions and 81 deletions

View File

@ -1,8 +1,9 @@
import * as crypto from 'libp2p-crypto';
import {KeyPair, PeerId} from "../src/@types/libp2p";
import {keys} from 'libp2p-crypto';
import {KeyPair} from "../src/@types/libp2p";
import PeerId from "peer-id";
export async function generateEd25519Keys() {
return await crypto.keys.generateKeyPair('ed25519');
return await keys.generateKeyPair('ed25519');
}
export function getKeyPairFromPeerId(peerId: PeerId): KeyPair {