thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bring protocol_test back in-line with new APIs

Browse source
This commit is contained in:
Matt Corallo 2015-01-12 14:32:20 -10:00
parent 6124084807
commit 2b0866ee1f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
test/protocol_test.js
View file

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