diff --git a/spec/TestClient.js b/spec/TestClient.js index 805e051d6..1663847d2 100644 --- a/spec/TestClient.js +++ b/spec/TestClient.js @@ -25,7 +25,7 @@ import sdk from '..'; import testUtils from './test-utils'; import MockHttpBackend from 'matrix-mock-request'; import LocalStorageCryptoStore from '../lib/crypto/store/localStorage-crypto-store'; -import logger from '../src/logger'; +import logger from '../lib/logger'; /** * Wrapper for a MockStorageApi, MockHttpBackend and MatrixClient diff --git a/spec/integ/devicelist-integ-spec.js b/spec/integ/devicelist-integ-spec.js index 4c73ea7c8..52c906625 100644 --- a/spec/integ/devicelist-integ-spec.js +++ b/spec/integ/devicelist-integ-spec.js @@ -17,7 +17,7 @@ limitations under the License. import TestClient from '../TestClient'; import testUtils from '../test-utils'; -import logger from '../../src/logger'; +import logger from '../../lib/logger'; const ROOM_ID = "!room:id"; diff --git a/spec/integ/matrix-client-crypto.spec.js b/spec/integ/matrix-client-crypto.spec.js index 4845f6338..1e3471b64 100644 --- a/spec/integ/matrix-client-crypto.spec.js +++ b/spec/integ/matrix-client-crypto.spec.js @@ -34,7 +34,7 @@ const sdk = require("../.."); const utils = require("../../lib/utils"); const testUtils = require("../test-utils"); const TestClient = require('../TestClient').default; -import logger from '../../src/logger'; +import logger from '../../lib/logger'; let aliTestClient; const roomId = "!room:localhost"; diff --git a/spec/integ/matrix-client-event-timeline.spec.js b/spec/integ/matrix-client-event-timeline.spec.js index 04f9c72f2..7024e47c6 100644 --- a/spec/integ/matrix-client-event-timeline.spec.js +++ b/spec/integ/matrix-client-event-timeline.spec.js @@ -4,7 +4,7 @@ const sdk = require("../.."); const HttpBackend = require("matrix-mock-request"); const utils = require("../test-utils"); const EventTimeline = sdk.EventTimeline; -import logger from '../../src/logger'; +import logger from '../../lib/logger'; const baseUrl = "http://localhost.or.something"; const userId = "@alice:localhost"; diff --git a/spec/integ/megolm-integ.spec.js b/spec/integ/megolm-integ.spec.js index 45daa0d40..858568e94 100644 --- a/spec/integ/megolm-integ.spec.js +++ b/spec/integ/megolm-integ.spec.js @@ -21,7 +21,7 @@ const anotherjson = require('another-json'); const utils = require('../../lib/utils'); const testUtils = require('../test-utils'); const TestClient = require('../TestClient').default; -import logger from '../../src/logger'; +import logger from '../../lib/logger'; const ROOM_ID = "!room:id"; diff --git a/spec/olm-loader.js b/spec/olm-loader.js index c3353621b..25ba6a5a5 100644 --- a/spec/olm-loader.js +++ b/spec/olm-loader.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import logger from '../src/logger'; +import logger from '../lib/logger'; // try to load the olm library. try { diff --git a/spec/test-utils.js b/spec/test-utils.js index ab75e193c..b18d10ae1 100644 --- a/spec/test-utils.js +++ b/spec/test-utils.js @@ -2,7 +2,7 @@ // load olm before the sdk if possible import './olm-loader'; -import logger from '../src/logger'; +import logger from '../lib/logger'; import sdk from '..'; const MatrixEvent = sdk.MatrixEvent; diff --git a/spec/unit/crypto/DeviceList.spec.js b/spec/unit/crypto/DeviceList.spec.js index 170bc0cb6..683187b78 100644 --- a/spec/unit/crypto/DeviceList.spec.js +++ b/spec/unit/crypto/DeviceList.spec.js @@ -18,7 +18,7 @@ limitations under the License. import DeviceList from '../../../lib/crypto/DeviceList'; import MemoryCryptoStore from '../../../lib/crypto/store/memory-crypto-store.js'; import utils from '../../../lib/utils'; -import logger from '../../../src/logger'; +import logger from '../../../lib/logger'; const signedDeviceList = { "failures": {}, diff --git a/spec/unit/crypto/algorithms/megolm.spec.js b/spec/unit/crypto/algorithms/megolm.spec.js index d8fd6b148..88beac84f 100644 --- a/spec/unit/crypto/algorithms/megolm.spec.js +++ b/spec/unit/crypto/algorithms/megolm.spec.js @@ -7,7 +7,7 @@ import MockStorageApi from '../../../MockStorageApi'; import testUtils from '../../../test-utils'; import OlmDevice from '../../../../lib/crypto/OlmDevice'; import Crypto from '../../../../lib/crypto'; -import logger from '../../../../src/logger'; +import logger from '../../../../lib/logger'; const MatrixEvent = sdk.MatrixEvent; const MegolmDecryption = algorithms.DECRYPTION_CLASSES['m.megolm.v1.aes-sha2']; diff --git a/spec/unit/crypto/algorithms/olm.spec.js b/spec/unit/crypto/algorithms/olm.spec.js index 04bd0c322..e701e2894 100644 --- a/spec/unit/crypto/algorithms/olm.spec.js +++ b/spec/unit/crypto/algorithms/olm.spec.js @@ -18,7 +18,7 @@ import '../../../olm-loader'; import MemoryCryptoStore from '../../../../lib/crypto/store/memory-crypto-store.js'; import MockStorageApi from '../../../MockStorageApi'; -import logger from '../../../../src/logger'; +import logger from '../../../../lib/logger'; import OlmDevice from '../../../../lib/crypto/OlmDevice'; import olmlib from '../../../../lib/crypto/olmlib'; diff --git a/spec/unit/crypto/backup.spec.js b/spec/unit/crypto/backup.spec.js index beea0a868..acba78310 100644 --- a/spec/unit/crypto/backup.spec.js +++ b/spec/unit/crypto/backup.spec.js @@ -25,7 +25,7 @@ import testUtils from '../../test-utils'; import OlmDevice from '../../../lib/crypto/OlmDevice'; import Crypto from '../../../lib/crypto'; -import logger from '../../../src/logger'; +import logger from '../../../lib/logger'; import olmlib from '../../../lib/crypto/olmlib'; const Olm = global.Olm; diff --git a/spec/unit/crypto/verification/qr_code.spec.js b/spec/unit/crypto/verification/qr_code.spec.js index 688f7028b..3c92426b9 100644 --- a/spec/unit/crypto/verification/qr_code.spec.js +++ b/spec/unit/crypto/verification/qr_code.spec.js @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -import logger from '../../../../src/logger'; +import logger from '../../../../lib/logger'; try { global.Olm = require('olm'); diff --git a/spec/unit/crypto/verification/request.spec.js b/spec/unit/crypto/verification/request.spec.js index 4fb103457..99ba0225b 100644 --- a/spec/unit/crypto/verification/request.spec.js +++ b/spec/unit/crypto/verification/request.spec.js @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -import logger from '../../../../src/logger'; +import logger from '../../../../lib/logger'; try { global.Olm = require('olm'); diff --git a/spec/unit/crypto/verification/sas.spec.js b/spec/unit/crypto/verification/sas.spec.js index e351029ea..aa358dbf9 100644 --- a/spec/unit/crypto/verification/sas.spec.js +++ b/spec/unit/crypto/verification/sas.spec.js @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -import logger from '../../../../src/logger'; +import logger from '../../../../lib/logger'; try { global.Olm = require('olm'); diff --git a/spec/unit/event.spec.js b/spec/unit/event.spec.js index 713a698e7..225580d81 100644 --- a/spec/unit/event.spec.js +++ b/spec/unit/event.spec.js @@ -17,7 +17,7 @@ limitations under the License. import sdk from '../..'; const MatrixEvent = sdk.MatrixEvent; -import logger from '../../src/logger'; +import logger from '../../lib/logger'; describe("MatrixEvent", () => { describe(".attemptDecryption", () => { diff --git a/spec/unit/interactive-auth.spec.js b/spec/unit/interactive-auth.spec.js index 214a5de9a..0d706da30 100644 --- a/spec/unit/interactive-auth.spec.js +++ b/spec/unit/interactive-auth.spec.js @@ -21,7 +21,7 @@ const sdk = require("../.."); const InteractiveAuth = sdk.InteractiveAuth; const MatrixError = sdk.MatrixError; -import logger from '../../src/logger'; +import logger from '../../lib/logger'; // Trivial client object to test interactive auth // (we do not need TestClient here) diff --git a/spec/unit/matrix-client.spec.js b/spec/unit/matrix-client.spec.js index 32be55f5e..c1726e174 100644 --- a/spec/unit/matrix-client.spec.js +++ b/spec/unit/matrix-client.spec.js @@ -3,7 +3,7 @@ import 'source-map-support/register'; const sdk = require("../.."); const MatrixClient = sdk.MatrixClient; -import logger from '../../src/logger'; +import logger from '../../lib/logger'; jest.useFakeTimers();