tests(e2e): use @trezor/connect package

trezor · Apr 6, 2022 · 23e491a · 23e491a
1 parent e576de8
commit 23e491a
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 20 deletions.
diff --git a/packages/integration-tests/projects/connect/README.md b/packages/integration-tests/projects/connect/README.md
@@ -1,8 +1,8 @@
-# trezor-connect tests
+# @trezor/connect tests
 
 ## jest test
 
-Testing `trezor-connect` npm package in nodejs environment.
+Testing `@trezor/connect` npm package in nodejs environment.
 
 ```
 ./docker/docker-connect-test.sh

diff --git a/packages/integration-tests/projects/connect/__fixtures__/cardanoGetAddress.ts b/packages/integration-tests/projects/connect/__fixtures__/cardanoGetAddress.ts
@@ -1,4 +1,4 @@
-import { NETWORK_IDS, PROTOCOL_MAGICS } from 'trezor-connect/lib/constants/cardano';
+import { NETWORK_IDS, PROTOCOL_MAGICS } from '@trezor/connect/lib/constants/cardano';
 import { CardanoAddressType } from '@trezor/transport/lib/types/messages';
 
 const legacyResults = [

diff --git a/packages/integration-tests/projects/connect/__fixtures__/cardanoSignTransaction.ts b/packages/integration-tests/projects/connect/__fixtures__/cardanoSignTransaction.ts
@@ -1,4 +1,4 @@
-import { NETWORK_IDS, PROTOCOL_MAGICS } from 'trezor-connect/lib/constants/cardano';
+import { NETWORK_IDS, PROTOCOL_MAGICS } from '@trezor/connect/lib/constants/cardano';
 import {
     CardanoAddressType,
     CardanoCertificateType,
@@ -328,7 +328,7 @@ const SAMPLE_MINTS = {
 const FEE = '42';
 const TTL = '10';
 const VALIDITY_INTERVAL_START = '47';
-const SCRIPT_DATA_HASH = 'd593fd793c377ac50a3169bb8378ffc257c944da31aa8f355dfa5a4f6ff89e02';
+// const SCRIPT_DATA_HASH = 'd593fd793c377ac50a3169bb8378ffc257c944da31aa8f355dfa5a4f6ff89e02';
 
 const legacyResults = {
     beforeSignTx: {

diff --git a/packages/integration-tests/projects/connect/__fixtures__/stellarSignTransaction.ts b/packages/integration-tests/projects/connect/__fixtures__/stellarSignTransaction.ts
@@ -1,16 +1,12 @@
 /* eslint-disable camelcase, no-underscore-dangle */
 
 import commonFixtures from '../../../../../submodules/trezor-common/tests/fixtures/stellar/sign_tx.json';
-import {
-    StellarMemoType,
-    StellarAssetType,
-    StellarSignerType,
-} from 'trezor-connect/lib/typescript/trezor/protobuf';
+import { Messages } from '@trezor/transport';
 
 // operations are in protobuf format (snake_case)
 
 const transformAsset = asset => ({
-    type: StellarAssetType[asset.type],
+    type: Messages.StellarAssetType[asset.type],
     code: asset.code,
     issuer: asset.issuer,
 });
@@ -126,7 +122,7 @@ const transformOperation = op => {
                 homeDomain: op.home_domain,
                 inflationDest: op.inflation_destination_account,
                 signer: {
-                    type: StellarSignerType[op.signer_type],
+                    type: Messages.StellarSignerType[op.signer_type],
                     key: op.signer_key,
                     weight: op.signer_weight,
                 },
@@ -185,7 +181,7 @@ export default {
                         maxTime: parameters.tx.timebounds_end,
                     },
                     memo: {
-                        type: StellarMemoType[parameters.tx.memo_type],
+                        type: Messages.StellarMemoType[parameters.tx.memo_type],
                         text: parameters.tx.memo_text,
                         id: parameters.tx.memo_id,
                         hash: parameters.tx.memo_hash,

diff --git a/packages/integration-tests/projects/connect/__txcache__/index.js b/packages/integration-tests/projects/connect/__txcache__/index.js
@@ -20,7 +20,7 @@ const cacheFiles = (dir, cache = {}) => {
                 const content = JSON.parse(rawJson);
                 cache[key] = {
                     ...content,
-                    hash: file.split('.')[0], // add hash into object, required by trezor-connect params
+                    hash: file.split('.')[0], // add hash into object, required by @trezor/connect params
                 };
             } catch (error) {
                 console.error(`TX_CACHE parsing error: ${file}`);

diff --git a/packages/integration-tests/projects/connect/common.setup.js b/packages/integration-tests/projects/connect/common.setup.js
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase, no-bitwise */
 
-import TrezorConnect from 'trezor-connect';
+import TrezorConnect from '@trezor/connect';
 import * as versionUtils from '@trezor/utils/src/versionUtils'; // NOTE: only this module is required
 import { UI } from '@trezor/connect/src/events'; // NOTE: import UI constants directly from source
 import { toHardened, getHDPath } from '@trezor/connect/src/utils/pathUtils'; // NOTE: import utils directly from source

diff --git a/packages/integration-tests/projects/connect/karma.config.js b/packages/integration-tests/projects/connect/karma.config.js
@@ -100,8 +100,8 @@ module.exports = config => {
                 }),
                 // replace TrezorConnect module used in ./tests/common.setup.js
                 new webpack.NormalModuleReplacementPlugin(
-                    /^trezor-connect$/,
-                    path.join(__dirname, '../../../connect-web/build/trezor-connect'),
+                    /^@trezor\/connect$/,
+                    path.join(__dirname, '../../../connect-web/build/trezor-connect.js'),
                 ),
                 // replace ws module used in ./tests/websocket-client.js
                 new webpack.NormalModuleReplacementPlugin(

diff --git a/packages/integration-tests/projects/connect/karma.plugin.js b/packages/integration-tests/projects/connect/karma.plugin.js
@@ -8,7 +8,7 @@ function CustomReporter(rootConfig, logger) {
 
     return {
         onRunStart: () => {
-            log.info('Running trezor-connect tests...');
+            log.info('Running @trezor/connect tests...');
             log.info('FW:', process.env.TESTS_FIRMWARE);
             log.info('Methods:', process.env.TESTS_INCLUDED_METHODS || 'All');
         },

diff --git a/packages/integration-tests/projects/connect/tests/api/init.test.ts b/packages/integration-tests/projects/connect/tests/api/init.test.ts
@@ -1,4 +1,4 @@
-import TrezorConnect from 'trezor-connect';
+import TrezorConnect from '@trezor/connect';
 
 // error thrown by .init()
 const INIT_ERROR = { code: 'Init_ManifestMissing' };

diff --git a/packages/integration-tests/projects/connect/tests/device/methods.test.ts b/packages/integration-tests/projects/connect/tests/device/methods.test.ts
@@ -1,4 +1,4 @@
-import TrezorConnect from 'trezor-connect';
+import TrezorConnect from '@trezor/connect';
 import fixtures from '../../__fixtures__';
 
 const { getController, setup, skipTest, conditionalTest, initTrezorConnect } = global.Trezor;