matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Replace more Bluebirdy stuffs

Browse Source
This commit is contained in:
Michael Telatynski
2019-11-25 14:33:25 +00:00
parent fddf2843b4
commit bab4582139
5 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/unit/crypto/DeviceList.spec.js
View File

@@ -87,7 +87,7 @@ describe('DeviceList', function() {
dl.startTrackingDeviceList('@test1:sw1v.org'); dl.startTrackingDeviceList('@test1:sw1v.org');
const queryDefer1 = Promise.defer(); const queryDefer1 = utils.defer();
downloadSpy.mockReturnValue(queryDefer1.promise); downloadSpy.mockReturnValue(queryDefer1.promise);
const prom1 = dl.refreshOutdatedDeviceLists(); const prom1 = dl.refreshOutdatedDeviceLists();
@@ -106,7 +106,7 @@ describe('DeviceList', function() {
dl.startTrackingDeviceList('@test1:sw1v.org'); dl.startTrackingDeviceList('@test1:sw1v.org');
const queryDefer1 = Promise.defer(); const queryDefer1 = utils.defer();
downloadSpy.mockReturnValue(queryDefer1.promise); downloadSpy.mockReturnValue(queryDefer1.promise);
const prom1 = dl.refreshOutdatedDeviceLists(); const prom1 = dl.refreshOutdatedDeviceLists();
@@ -114,7 +114,7 @@ describe('DeviceList', function() {
downloadSpy.mockReset(); downloadSpy.mockReset();
// outdated notif arrives while the request is in flight. // outdated notif arrives while the request is in flight.
const queryDefer2 = Promise.defer(); const queryDefer2 = utils.defer();
downloadSpy.mockReturnValue(queryDefer2.promise); downloadSpy.mockReturnValue(queryDefer2.promise);
dl.invalidateUserDeviceList('@test1:sw1v.org'); dl.invalidateUserDeviceList('@test1:sw1v.org');
@@ -134,7 +134,7 @@ describe('DeviceList', function() {
logger.log("Creating new devicelist to simulate app reload"); logger.log("Creating new devicelist to simulate app reload");
downloadSpy.mockReset(); downloadSpy.mockReset();
const dl2 = createTestDeviceList(); const dl2 = createTestDeviceList();
const queryDefer3 = Promise.defer(); const queryDefer3 = utils.defer();
downloadSpy.mockReturnValue(queryDefer3.promise); downloadSpy.mockReturnValue(queryDefer3.promise);
const prom3 = dl2.refreshOutdatedDeviceLists(); const prom3 = dl2.refreshOutdatedDeviceLists();

4
spec/unit/crypto/algorithms/megolm.spec.js
View File

@@ -56,7 +56,7 @@ describe("MegolmDecryption", function() {
mockOlmLib = {}; mockOlmLib = {};
mockOlmLib.ensureOlmSessionsForDevices = jest.fn(); mockOlmLib.ensureOlmSessionsForDevices = jest.fn();
mockOlmLib.encryptMessageForDevice = mockOlmLib.encryptMessageForDevice =
jest.fn().mockReturnValue(Promise.resolve()); jest.fn().mockResolvedValue(undefined);
megolmDecryption.olmlib = mockOlmLib; megolmDecryption.olmlib = mockOlmLib;
}); });
@@ -282,7 +282,7 @@ describe("MegolmDecryption", function() {
}, },
}, },
})); }));
mockBaseApis.sendToDevice = jest.fn().mockReturnValue(Promise.resolve()); mockBaseApis.sendToDevice = jest.fn().mockResolvedValue(undefined);
mockCrypto.downloadKeys.mockReturnValue(Promise.resolve({ mockCrypto.downloadKeys.mockReturnValue(Promise.resolve({
'@alice:home.server': { '@alice:home.server': {

2
spec/unit/crypto/backup.spec.js
View File

@@ -157,7 +157,7 @@ describe("MegolmBackup", function() {
mockOlmLib = {}; mockOlmLib = {};
mockOlmLib.ensureOlmSessionsForDevices = jest.fn(); mockOlmLib.ensureOlmSessionsForDevices = jest.fn();
mockOlmLib.encryptMessageForDevice = mockOlmLib.encryptMessageForDevice =
jest.fn().mockReturnValue(Promise.resolve()); jest.fn().mockResolvedValue(undefined);
}); });
describe("backup", function() { describe("backup", function() {

29
spec/unit/scheduler.spec.js
View File

@@ -3,6 +3,7 @@
import 'source-map-support/register'; import 'source-map-support/register';
import Promise from 'bluebird'; import Promise from 'bluebird';
import {defer} from '../../src/utils';
const sdk = require("../.."); const sdk = require("../..");
const MatrixScheduler = sdk.MatrixScheduler; const MatrixScheduler = sdk.MatrixScheduler;
const MatrixError = sdk.MatrixError; const MatrixError = sdk.MatrixError;
@@ -14,7 +15,7 @@ describe("MatrixScheduler", function() {
let scheduler; let scheduler;
let retryFn; let retryFn;
let queueFn; let queueFn;
let defer; let deferred;
const roomId = "!foo:bar"; const roomId = "!foo:bar";
const eventA = utils.mkMessage({ const eventA = utils.mkMessage({
user: "@alice:bar", room: roomId, event: true, user: "@alice:bar", room: roomId, event: true,
@@ -37,7 +38,7 @@ describe("MatrixScheduler", function() {
}); });
retryFn = null; retryFn = null;
queueFn = null; queueFn = null;
defer = Promise.defer(); deferred = defer();
}); });
it("should process events in a queue in a FIFO manner", async function() { it("should process events in a queue in a FIFO manner", async function() {
@@ -47,8 +48,8 @@ describe("MatrixScheduler", function() {
queueFn = function() { queueFn = function() {
return "one_big_queue"; return "one_big_queue";
}; };
const deferA = Promise.defer(); const deferA = defer();
const deferB = Promise.defer(); const deferB = defer();
let yieldedA = false; let yieldedA = false;
scheduler.setProcessFunction(function(event) { scheduler.setProcessFunction(function(event) {
if (yieldedA) { if (yieldedA) {
@@ -74,7 +75,7 @@ describe("MatrixScheduler", function() {
it("should invoke the retryFn on failure and wait the amount of time specified", it("should invoke the retryFn on failure and wait the amount of time specified",
async function() { async function() {
const waitTimeMs = 1500; const waitTimeMs = 1500;
const retryDefer = Promise.defer(); const retryDefer = defer();
retryFn = function() { retryFn = function() {
retryDefer.resolve(); retryDefer.resolve();
return waitTimeMs; return waitTimeMs;
@@ -88,9 +89,9 @@ describe("MatrixScheduler", function() {
procCount += 1; procCount += 1;
if (procCount === 1) { if (procCount === 1) {
expect(ev).toEqual(eventA); expect(ev).toEqual(eventA);
return defer.promise; return deferred.promise;
} else if (procCount === 2) { } else if (procCount === 2) {
// don't care about this defer // don't care about this deferred
return new Promise(); return new Promise();
} }
expect(procCount).toBeLessThan(3); expect(procCount).toBeLessThan(3);
@@ -101,7 +102,7 @@ describe("MatrixScheduler", function() {
// wait just long enough before it does // wait just long enough before it does
await Promise.resolve(); await Promise.resolve();
expect(procCount).toEqual(1); expect(procCount).toEqual(1);
defer.reject({}); deferred.reject({});
await retryDefer.promise; await retryDefer.promise;
expect(procCount).toEqual(1); expect(procCount).toEqual(1);
jest.advanceTimersByTime(waitTimeMs); jest.advanceTimersByTime(waitTimeMs);
@@ -121,8 +122,8 @@ describe("MatrixScheduler", function() {
return "yep"; return "yep";
}; };
const deferA = Promise.defer(); const deferA = defer();
const deferB = Promise.defer(); const deferB = defer();
let procCount = 0; let procCount = 0;
scheduler.setProcessFunction(function(ev) { scheduler.setProcessFunction(function(ev) {
procCount += 1; procCount += 1;
@@ -177,14 +178,14 @@ describe("MatrixScheduler", function() {
const expectOrder = [ const expectOrder = [
eventA.getId(), eventB.getId(), eventD.getId(), eventA.getId(), eventB.getId(), eventD.getId(),
]; ];
const deferA = Promise.defer(); const deferA = defer();
scheduler.setProcessFunction(function(event) { scheduler.setProcessFunction(function(event) {
const id = expectOrder.shift(); const id = expectOrder.shift();
expect(id).toEqual(event.getId()); expect(id).toEqual(event.getId());
if (expectOrder.length === 0) { if (expectOrder.length === 0) {
done(); done();
} }
return id === eventA.getId() ? deferA.promise : defer.promise; return id === eventA.getId() ? deferA.promise : deferred.promise;
}); });
scheduler.queueEvent(eventA); scheduler.queueEvent(eventA);
scheduler.queueEvent(eventB); scheduler.queueEvent(eventB);
@@ -298,7 +299,7 @@ describe("MatrixScheduler", function() {
scheduler.setProcessFunction(function(ev) { scheduler.setProcessFunction(function(ev) {
procCount += 1; procCount += 1;
expect(ev).toEqual(eventA); expect(ev).toEqual(eventA);
return defer.promise; return deferred.promise;
}); });
// as queueing doesn't start processing synchronously anymore (see commit bbdb5ac) // as queueing doesn't start processing synchronously anymore (see commit bbdb5ac)
// wait just long enough before it does // wait just long enough before it does
@@ -314,7 +315,7 @@ describe("MatrixScheduler", function() {
let procCount = 0; let procCount = 0;
scheduler.setProcessFunction(function(ev) { scheduler.setProcessFunction(function(ev) {
procCount += 1; procCount += 1;
return defer.promise; return deferred.promise;
}); });
expect(procCount).toEqual(0); expect(procCount).toEqual(0);
}); });

4
src/crypto/DeviceList.js
View File

@@ -31,7 +31,7 @@ import DeviceInfo from './deviceinfo';
import {CrossSigningInfo} from './CrossSigning'; import {CrossSigningInfo} from './CrossSigning';
import olmlib from './olmlib'; import olmlib from './olmlib';
import IndexedDBCryptoStore from './store/indexeddb-crypto-store'; import IndexedDBCryptoStore from './store/indexeddb-crypto-store';
import {sleep} from '../utils'; import {defer, sleep} from '../utils';
/* State transition diagram for DeviceList._deviceTrackingStatus /* State transition diagram for DeviceList._deviceTrackingStatus
@@ -711,7 +711,7 @@ class DeviceListUpdateSerialiser {
}); });
if (!this._queuedQueryDeferred) { if (!this._queuedQueryDeferred) {
this._queuedQueryDeferred = Promise.defer(); this._queuedQueryDeferred = defer();
} }
// We always take the new sync token and just use the latest one we've // We always take the new sync token and just use the latest one we've