colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename axolotl storage

Browse Source 
// FREEBIE
This commit is contained in:
lilia
2016-04-22 13:39:05 -07:00
parent ee3bc11e3c
commit 1d60dc38fb
13 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libtextsecure/test/generate_keys_test.js
View File

@@ -19,25 +19,25 @@ describe("Key generation", function() {
}
function itStoresPreKey(keyId) {
it('prekey ' + keyId + ' is valid', function(done) {
return textsecure.storage.axolotl.loadPreKey(keyId).then(function(keyPair) {
return textsecure.storage.protocol.loadPreKey(keyId).then(function(keyPair) {
validateStoredKeyPair(keyPair);
}).then(done,done);
});
}
function itStoresSignedPreKey(keyId) {
it('signed prekey ' + keyId + ' is valid', function(done) {
return textsecure.storage.axolotl.loadSignedPreKey(keyId).then(function(keyPair) {
return textsecure.storage.protocol.loadSignedPreKey(keyId).then(function(keyPair) {
validateStoredKeyPair(keyPair);
}).then(done,done);
});
}
function validateResultKey(resultKey) {
return textsecure.storage.axolotl.loadPreKey(resultKey.keyId).then(function(keyPair) {
return textsecure.storage.protocol.loadPreKey(resultKey.keyId).then(function(keyPair) {
assertEqualArrayBuffers(resultKey.publicKey, keyPair.pubKey);
});
}
function validateResultSignedKey(resultSignedKey) {
return textsecure.storage.axolotl.loadSignedPreKey(resultSignedKey.keyId).then(function(keyPair) {
return textsecure.storage.protocol.loadSignedPreKey(resultSignedKey.keyId).then(function(keyPair) {
assertEqualArrayBuffers(resultSignedKey.publicKey, keyPair.pubKey);
});
}
@@ -45,7 +45,7 @@ describe("Key generation", function() {
before(function(done) {
localStorage.clear();
axolotl.util.generateIdentityKeyPair().then(function(keyPair) {
return textsecure.storage.axolotl.put('identityKey', keyPair);
return textsecure.storage.protocol.put('identityKey', keyPair);
}).then(done, done);
});
@@ -164,7 +164,7 @@ describe("Key generation", function() {
validateResultSignedKey(result.signedPreKey).then(done,done);
});
it('deletes signed key 1', function() {
textsecure.storage.axolotl.loadSignedPreKey(1).then(function(keyPair) {
textsecure.storage.protocol.loadSignedPreKey(1).then(function(keyPair) {
assert.isUndefined(keyPair);
});
});