keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

Bring protocol_test back in-line with new APIs

Browse Source
pull/749/head
Matt Corallo 10 years ago
parent 6124084807
commit 2b0866ee1f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File

14
test/protocol_test.js
Unescape Escape View File

@ -84,24 +84,26 @@ describe('Protocol', function() {
describe("Axolotl", function() { describe("Axolotl", function() {
var runAxolotlTest = function(v) { var runAxolotlTest = function(v) {
var origCreateNewKeyPair = textsecure.crypto.testing_only.createNewKeyPair; var origCreateKeyPair = textsecure.crypto.createKeyPair;
var doStep; var doStep;
var stepDone; var stepDone;
stepDone = function(res) { stepDone = function(res) {
if (!res || privKeyQueue.length != 0 || Object.keys(getKeysForNumberMap).length != 0 || Object.keys(messagesSentMap).length != 0) { if (!res || privKeyQueue.length != 0 || Object.keys(getKeysForNumberMap).length != 0 || Object.keys(messagesSentMap).length != 0) {
textsecure.crypto.testing_only.createNewKeyPair = origCreateNewKeyPair; textsecure.crypto.createKeyPair = origCreateKeyPair;
return false; return false;
} else if (step == v.length) { } else if (step == v.length) {
textsecure.crypto.testing_only.createNewKeyPair = origCreateNewKeyPair; textsecure.crypto.createKeyPair = origCreateKeyPair;
return true; return true;
} else } else
return doStep().then(stepDone); return doStep().then(stepDone);
} }
var privKeyQueue = []; var privKeyQueue = [];
textsecure.crypto.testing_only.createNewKeyPair = function(isIdentity) { textsecure.crypto.createKeyPair = function(privKey) {
if (privKeyQueue.length == 0 || isIdentity) if (privKey !== undefined)
return origCreateKeyPair(privKey);
if (privKeyQueue.length == 0)
throw new Error('Out of private keys'); throw new Error('Out of private keys');
else { else {
var privKey = privKeyQueue.shift(); var privKey = privKeyQueue.shift();
@ -193,7 +195,7 @@ describe('Protocol', function() {
if (data.endSession) if (data.endSession)
return textsecure.messaging.closeSession("SNOWDEN").then(checkMessage); return textsecure.messaging.closeSession("SNOWDEN").then(checkMessage);
else else
return textsecure.messaging.sendMessageToNumber("SNOWDEN", data.smsText, []).then(checkMessage); return textsecure.messaging.sendMessageToNumber("SNOWDEN", data.smsText, [], Date.now()).then(checkMessage);
} }
if (data.ourBaseKey !== undefined) if (data.ourBaseKey !== undefined)

Write Preview
Loading…
Cancel
Save