From 8c2001adbf491e3a876b658069d8d5a4d25a7f23 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Tue, 12 Mar 2019 17:24:34 -0400 Subject: [PATCH] don't reject on error because we ignore it anyways, and it makes an unrelated unit test fail --- src/crypto/olmlib.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crypto/olmlib.js b/src/crypto/olmlib.js index fcd9ce023..2752c368c 100644 --- a/src/crypto/olmlib.js +++ b/src/crypto/olmlib.js @@ -202,7 +202,7 @@ module.exports.ensureOlmSessionsForDevices = async function( ); } catch (e) { for (const resolver of Object.values(resolveSession)) { - resolver.reject(e); + resolver.resolve(); } logger.log("failed to claim one-time keys", e, devicesWithoutSession); throw e; @@ -237,7 +237,7 @@ module.exports.ensureOlmSessionsForDevices = async function( const msg = "No one-time keys (alg=" + oneTimeKeyAlgorithm + ") for device " + userId + ":" + deviceId; logger.warn(msg); - resolveSession[key].reject(new Error(msg)); + resolveSession[key].resolve(); continue; } @@ -248,7 +248,7 @@ module.exports.ensureOlmSessionsForDevices = async function( resolveSession[key].resolve(sid); result[userId][deviceId].sessionId = sid; }, (e) => { - resolveSession[key].reject(e); + resolveSession[key].resolve(); throw e; }), );