Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module.exports = {
preset: 'ts-jest',
testRegex: '((\\.|/)(e2e|test|spec))\\.[jt]sx?$',
moduleNameMapper: {
// NOTE(canonbrother): uncomment it only while test running with this dependency
// '@defichain/jellyfish': '<rootDir>/packages/jellyfish/src/jellyfish/src',
'@defichain/jellyfish-address': '<rootDir>/packages/jellyfish-address/src',
'@defichain/jellyfish-api-core': '<rootDir>/packages/jellyfish-api-core/src',
'@defichain/jellyfish-api-jsonrpc': '<rootDir>/packages/jellyfish-api-jsonrpc/src',
Expand All @@ -17,5 +15,9 @@ module.exports = {
'@defichain/testcontainers': '<rootDir>/packages/testcontainers/src',
'@defichain/testing': '<rootDir>/packages/testing/src'
},
testTimeout: 240000
testTimeout: 240000,
coveragePathIgnorePatterns: [
'/node_modules/',
'.*/__tests__/.*'
]
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"node": ">=14.x"
},
"scripts": {
"clean": "rm -rf ./packages/**/dist && rm -rf ./packages/**/tsconfig.build.tsbuildinfo",
"prepare": "husky install",
"build": "lerna run build",
"version": "lerna version $1 --yes --no-push --no-git-tag-version",
Expand All @@ -29,8 +30,7 @@
"standard": "ts-standard --fix",
"test": "jest --maxWorkers=100%",
"test:ci": "jest --ci --coverage --forceExit --maxWorkers=4",
"all": "npm run build && npm run standard && npm run test",
"clean": "rm -rf ./packages/**/dist && rm -rf ./packages/**/tsconfig.build.tsbuildinfo"
"all": "npm run clean && npm run build && npm run standard && npm run test"
},
"devDependencies": {
"@size-limit/preset-app": "^4.10.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { MnemonicHdNode, MnemonicHdNodeProvider, mnemonicToSeed, generateMnemonic } from '../../src'
import BigNumber from 'bignumber.js'
import { Transaction, Vout } from '@defichain/jellyfish-transaction'
import { OP_CODES } from '@defichain/jellyfish-transaction/src/script'
import { Transaction, Vout, OP_CODES } from '@defichain/jellyfish-transaction'
import { HASH160 } from '@defichain/jellyfish-crypto'

const regTestBip32Options = {
Expand Down
3 changes: 1 addition & 2 deletions packages/jellyfish-wallet/src/wallet_account.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Script } from '@defichain/jellyfish-transaction'
import { OP_CODES } from '@defichain/jellyfish-transaction/src/script'
import { Script, OP_CODES } from '@defichain/jellyfish-transaction'
import { WalletHdNode } from './wallet_hd_node'
import { Bech32, HASH160 } from '@defichain/jellyfish-crypto'
import { Network } from '@defichain/jellyfish-network'
Expand Down
4 changes: 2 additions & 2 deletions packages/testing/src/poolpair.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import BigNumber from 'bignumber.js'
import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
import { CreatePoolPairUTXO } from '@defichain/jellyfish-api-core/src/category/poolpair'
import { poolpair } from '@defichain/jellyfish-api-core'
import { getNewAddress } from './wallet'

/**
Expand Down Expand Up @@ -37,7 +37,7 @@ export interface CreatePoolPairOptions {
commission?: number
status?: boolean
ownerAddress?: string
utxos?: CreatePoolPairUTXO[]
utxos?: poolpair.CreatePoolPairUTXO[]
}

/**
Expand Down
1 change: 0 additions & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// tsconfig global project options - build or dev
{
"compilerOptions": {
"lib": ["es2020"],
Expand Down
6 changes: 0 additions & 6 deletions tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
// Build (not dev) tsconfig
{
"extends": "./tsconfig.base.json",
// monorepo settings
"compilerOptions": {
"composite": true,
"declaration": true,
"declarationMap": true,
"sourceMap": true,
},

// Note(canonbrother): Intentionally blank to prevent output unnecessary files
"files": [],

"references": [
{"path": "./packages/jellyfish/tsconfig.build.json"},
{"path": "./packages/jellyfish-address/tsconfig.build.json"},
{"path": "./packages/jellyfish-api-core/tsconfig.build.json"},
{"path": "./packages/jellyfish-api-jsonrpc/tsconfig.build.json"},
Expand Down
15 changes: 0 additions & 15 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,6 @@
"compilerOptions": {
"baseUrl": "./packages",
"paths": {
"@defichain/jellyfish": ["jellyfish/src"],
"@defichain/jellyfish-address": ["jellyfish-address/src"],
"@defichain/jellyfish-api-core": ["jellyfish-api-core/src"],
"@defichain/jellyfish-api-jsonrpc": ["jellyfish-api-jsonrpc/src"],
"@defichain/jellyfish-crypto": ["jellyfish-crypto/src"],
"@defichain/jellyfish-json": ["jellyfish-json/src"],
"@defichain/jellyfish-network": ["jellyfish-network/src"],
"@defichain/jellyfish-transaction": ["jellyfish-transaction/src"],
"@defichain/jellyfish-transaction-builder": ["jellyfish-transaction-builder/src"],
"@defichain/jellyfish-wallet": ["jellyfish-wallet/src"],
"@defichain/jellyfish-wallet-mnemonic": ["jellyfish-wallet-mnemonic/src"],
"@defichain/testcontainers": ["testcontainers/src"],
"@defichain/testing": ["testing/src"],

"@defichain/jellyfish/*": ["jellyfish/src/*"],
"@defichain/jellyfish-address/*": ["jellyfish-address/src/*"],
"@defichain/jellyfish-api-core/*": ["jellyfish-api-core/src/*"],
"@defichain/jellyfish-api-jsonrpc/*": ["jellyfish-api-jsonrpc/src/*"],
Expand Down