Update encoder functions

This commit is contained in:
Belma Gutlic
2020-01-07 10:29:40 +01:00
parent fc818c746c
commit dff2450b18
6 changed files with 42 additions and 46 deletions

View File

@ -12,7 +12,7 @@ import {
getHandshakePayload,
signPayload
} from "../src/utils";
import { decodeMessageBuffer, encodeMessageBuffer } from "../src/encoder";
import {decode0, decode1, encode1} from "../src/encoder";
import {XX} from "../src/handshakes/xx";
import {Buffer} from "buffer";
import {getKeyPairFromPeerId} from "./utils";
@ -63,7 +63,7 @@ describe("Noise", () => {
const handshake = new Handshake(false, libp2pPrivKey, libp2pPubKey, prologue, staticKeys, wrapped, localPeer, xx);
let receivedMessageBuffer = decodeMessageBuffer((await wrapped.readLP()).slice());
let receivedMessageBuffer = decode0((await wrapped.readLP()).slice());
// The first handshake message contains the initiator's ephemeral public key
expect(receivedMessageBuffer.ne.length).equal(32);
xx.recvMessage(handshake.session, receivedMessageBuffer);
@ -73,10 +73,10 @@ describe("Noise", () => {
const handshakePayload = await createHandshakePayload(libp2pPubKey, libp2pPrivKey, signedPayload);
const messageBuffer = xx.sendMessage(handshake.session, handshakePayload);
wrapped.writeLP(encodeMessageBuffer(messageBuffer));
wrapped.writeLP(encode1(messageBuffer));
// Stage 2 - finish handshake
receivedMessageBuffer = decodeMessageBuffer((await wrapped.readLP()).slice());
receivedMessageBuffer = decode1((await wrapped.readLP()).slice());
xx.recvMessage(handshake.session, receivedMessageBuffer);
return {wrapped, handshake};
})(),

View File

@ -13,7 +13,7 @@ import {generateEd25519Keys, getKeyPairFromPeerId} from "./utils";
import {Handshake} from "../src/handshake-xx-fallback";
import {createPeerIdsFromFixtures} from "./fixtures/peer";
import {assert} from "chai";
import {encodeMessageBuffer} from "../src/encoder";
import {encode0} from "../src/encoder";
describe("XX Fallback Handshake", () => {
let peerA, peerB, fakePeer;
@ -43,7 +43,7 @@ describe("XX Fallback Handshake", () => {
signedPayload,
signedEarlyDataPayload,
);
const initialMsg = encodeMessageBuffer({
const initialMsg = encode0({
ne: staticKeysInitiator.publicKey,
ns: Buffer.alloc(32),
ciphertext: handshakePayload,