Merge pull request #587 from matrix-org/dbkr/inbound_sessions_to_cryp…

…tostore Migrate inbound sessions to cryptostore
matrix-org · Jan 9, 2018 · af4f05c · af4f05c
2 parents 8403042 + 145c760
commit af4f05c
Show file tree

Hide file tree

Showing 9 changed files with 515 additions and 253 deletions.
diff --git a/spec/unit/crypto/algorithms/megolm.spec.js b/spec/unit/crypto/algorithms/megolm.spec.js
@@ -10,6 +10,7 @@ import Promise from 'bluebird';
 import sdk from '../../../..';
 import algorithms from '../../../../lib/crypto/algorithms';
 import WebStorageSessionStore from '../../../../lib/store/session/webstorage';
+import MemoryCryptoStore from '../../../../lib/crypto/store/memory-crypto-store.js';
 import MockStorageApi from '../../../MockStorageApi';
 import testUtils from '../../../test-utils';
 
@@ -45,8 +46,9 @@ describe("MegolmDecryption", function() {
 
         const mockStorage = new MockStorageApi();
         const sessionStore = new WebStorageSessionStore(mockStorage);
+        const cryptoStore = new MemoryCryptoStore(mockStorage);
 
-        const olmDevice = new OlmDevice(sessionStore);
+        const olmDevice = new OlmDevice(sessionStore, cryptoStore);
 
         megolmDecryption = new MegolmDecryption({
             userId: '@user:id',