Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Converted shared helpers to typescript #21

Open
wants to merge 1 commit into
base: metrics-typescript
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion packages/app/src/components/protocol/Protocol.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Store from '../../store/store'
import Network from '../../web3/Network'
import ProtocolActions from '../../actions/protocol'
import { fromWei } from 'web3-utils'
import { bn } from '@aragon/protocol-backend-shared/helpers/numbers'
import { bn } from '@aragon/protocol-backend-shared/build/helpers/numbers'

export default class Protocol extends React.Component {

Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/web3/Network.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Protocol from '@aragon/protocol-backend-shared/models/Protocol'
import Environment from '@aragon/protocol-backend-shared/models/environments/BrowserEnvironment'
import Protocol from '@aragon/protocol-backend-shared/build/models/Protocol'
import Environment from '@aragon/protocol-backend-shared/build/models/environments/BrowserEnvironment'

const FAUCET = {
staging: '0x19420Cf68cf6a8d18882730c8e8BAd169eeb1bdC',
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ To use the CLI tool locally simply run the following commands to install it loca
```bash
git clone https://github.com/aragon/protocol-backend/
cd protocol-backend
npm i
npx lerna bootstrap
yarn install
yarn build:shared
cd packages/cli
```

Expand Down
6 changes: 3 additions & 3 deletions packages/cli/bin/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
const fs = require('fs')
const path = require('path')
const yargs = require('yargs')
const Logger = require('@aragon/protocol-backend-shared/helpers/logger')
const Environment = require('@aragon/protocol-backend-shared/models/environments/TruffleEnvironment')
const { setDefaults } = require('@aragon/protocol-backend-shared/build/helpers/logger')
const Environment = require('@aragon/protocol-backend-shared/build/models/environments/TruffleEnvironment').default
const errorHandler = require('../src/helpers/error-handler')

const DEFAULT_OPTIONS = {
Expand All @@ -24,7 +24,7 @@ commands.forEach(commandFilename => {
command.handler = argv => {
const { from, network, silent, verbose } = argv
const environment = new Environment(network, from)
Logger.setDefaults(silent, verbose)
setDefaults(silent, verbose)
command.handlerAsync(environment, argv).then(() => process.exit(0)).catch(errorHandler)
}

Expand Down
8 changes: 4 additions & 4 deletions packages/cli/bin/setup.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const yargs = require('yargs')
const { bn } = require('@aragon/protocol-backend-shared/helpers/numbers')
const { bn } = require('@aragon/protocol-backend-shared/build/helpers/numbers')
const { execSync } = require('child_process')
const errorHandler = require('../src/helpers/error-handler')
const Logger = require('@aragon/protocol-backend-shared/helpers/logger')
const Environment = require('@aragon/protocol-backend-shared/models/environments/TruffleEnvironment')
const { Logger, setDefaults } = require('@aragon/protocol-backend-shared/build/helpers/logger')
const Environment = require('@aragon/protocol-backend-shared/build/models/environments/TruffleEnvironment').default

Logger.setDefaults(false, false)
setDefaults(false, false)
const logger = Logger('setup')

const { network, guardians: guardiansNumber, disputes } = yargs
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/activate.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('activate')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('activate')

const command = 'activate'
const describe = 'Activate tokens to the Protocol'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/appeal.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('appeal')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('appeal')

const command = 'appeal'
const describe = 'Appeal dispute in favour of a certain outcome'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/arbitrable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('arbitrable')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('arbitrable')

const command = 'arbitrable'
const describe = 'Create new Arbitrable instance for the Protocol'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/commit.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('commit')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('commit')

const command = 'commit'
const describe = 'Commit vote for a dispute round'
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path')
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('config')
const { bn } = require('@aragon/protocol-backend-shared/helpers/numbers')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('config')
const { bn } = require('@aragon/protocol-backend-shared/build/helpers/numbers')

const command = 'config'
const describe = 'Get current protocol config or set a new one'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/confirm-appeal.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('confirm-appeal')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('confirm-appeal')

const command = 'confirm-appeal'
const describe = 'Confirm an existing appeal for a dispute'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/deactivate.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('deactivate')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('deactivate')

const command = 'deactivate'
const describe = 'Deactivate tokens to the Protocol'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/dispute.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('dispute')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('dispute')

const command = 'dispute'
const describe = 'Create dispute submitting evidence'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/draft.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('draft')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('draft')

const command = 'draft'
const describe = 'Draft dispute and close evidence submission period if necessary'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/execute.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('execute')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('execute')

const command = 'execute'
const describe = 'Execute ruling for a dispute'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/hearbeat.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('heartbeat')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('heartbeat')

const command = 'heartbeat'
const describe = 'Call protocol hearbeat'
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/commands/mint.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('mint')
const { bigExp } = require('@aragon/protocol-backend-shared/helpers/numbers')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('mint')
const { bigExp } = require('@aragon/protocol-backend-shared/build/helpers/numbers')

const command = 'mint'
const describe = 'Mint tokens for a certain address'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/payment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('payment')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('payment')

const command = 'payment'
const describe = 'Make Aragon Protocol payment'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/reveal.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('reveal')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('reveal')

const command = 'reveal'
const describe = 'Reveal committed vote'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/settle-juror.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('settle-guardian')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('settle-guardian')

const command = 'settle-guardian'
const describe = 'Settle guardian for a dispute'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/settle-round.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('settle-round')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('settle-round')

const command = 'settle-round'
const describe = 'Settle penalties and appeals for a dispute'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/stake.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('stake')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('stake')

const command = 'stake'
const describe = 'Stake tokens for a guardian'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/unstake.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('unstake')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('unstake')

const command = 'unstake'
const describe = 'Unstake tokens for a guardian'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/helpers/error-handler.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('Error Handler')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('Error Handler')

module.exports = error => {
logger.error(`Process finished with error:`)
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/controllers/RevealsController.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Reveal } from '@aragon/protocol-backend-shared/build/models/objection'
import HttpError from '../errors/http-error'
import RevealsValidator from '../validators/RevealsValidator'
import { decodeVoteId } from '@aragon/protocol-backend-shared/helpers/voting'
import { decodeVoteId } from '@aragon/protocol-backend-shared/build/helpers/voting'

export default {
async show(request, response) {
Expand Down
4 changes: 2 additions & 2 deletions packages/server/src/validators/RevealsValidator.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Reveal } from '@aragon/protocol-backend-shared/build/models/objection'
import Network from '../web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import BaseValidator from './BaseValidator'
const { hashVote } = require('@aragon/protocol-backend-shared/helpers/voting')
const { hashVote } = require('@aragon/protocol-backend-shared/build/helpers/voting')

class RevealsValidator extends BaseValidator {
async validateForCreate({ guardian, voteId, outcome, salt }) {
Expand Down
1 change: 0 additions & 1 deletion packages/services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"db:setup": "lerna run db:setup --scope '*/*-shared' --stream"
},
"dependencies": {
"@aragon/protocol-backend-server": "^0.2.21",
"@aragon/protocol-backend-shared": "^0.2.21",
"axios": "^0.19.0",
"dateformat": "^3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/services/src/bin/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import path from 'path'
import { fork } from 'child_process'
import { workers } from './config'
import Logger from '@aragon/protocol-backend-shared/helpers/logger'
import Logger from '@aragon/protocol-backend-shared/build/helpers/logger'

require('dotenv').config()

Expand Down
2 changes: 1 addition & 1 deletion packages/services/src/helpers/error-handler.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('@aragon/protocol-backend-shared/helpers/logger')('Error Handler')
const logger = require('@aragon/protocol-backend-shared/build/helpers/logger').default('Error Handler')

export default error => {
logger.error(`Process finished with error:`)
Expand Down
4 changes: 2 additions & 2 deletions packages/services/src/helpers/term-id-getter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import { bn } from '@aragon/protocol-backend-shared/helpers/numbers'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import { bn } from '@aragon/protocol-backend-shared/build/helpers/numbers'

async function draftTermIdFor(state) {
const protocol = await Network.getProtocol()
Expand Down
4 changes: 2 additions & 2 deletions packages/services/src/helpers/worker-logger.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Logger = require('@aragon/protocol-backend-shared/helpers/logger')
const { Logger, setDefaults } = require('@aragon/protocol-backend-shared/build/helpers/logger')

class WorkerLogger {
constructor(worker, logger) {
Expand Down Expand Up @@ -32,4 +32,4 @@ module.exports = (worker, color) => {
return new WorkerLogger(worker, logger)
}

module.exports.setDefaults = Logger.setDefaults
module.exports.setDefaults = setDefaults
2 changes: 1 addition & 1 deletion packages/services/src/models/Etherscan.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import axios from 'axios'
import { bn } from '@aragon/protocol-backend-shared/helpers/numbers'
import { bn } from '@aragon/protocol-backend-shared/build/helpers/numbers'

const BASE_URL = 'https://<network>.etherscan.io/api?'
const DEFAULT_API_KEY = process.env.ETHERSCAN_API_KEY
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import NotificationScannerBaseModel from './NotificationScannerBaseModel'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import { draftTermIdFor } from '../../helpers/term-id-getter'

class AppealsOpened extends NotificationScannerBaseModel {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import NotificationScannerBaseModel from './NotificationScannerBaseModel'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
const OUTCOMES = {
0: 'Missing',
1: 'Leaked',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import NotificationScannerBaseModel from './NotificationScannerBaseModel'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import { draftTermIdFor, dueDateFor } from '../../helpers/term-id-getter'
import dateFormat from 'dateformat'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import NotificationScannerBaseModel from './NotificationScannerBaseModel'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'

class GuardianDrafted extends NotificationScannerBaseModel {
async scan() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import NotificationScannerBaseModel from './NotificationScannerBaseModel'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import { draftTermIdFor } from '../../helpers/term-id-getter'

class MissedReveal extends NotificationScannerBaseModel {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import NotificationScannerBaseModel from './NotificationScannerBaseModel'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import { draftTermIdFor } from '../../helpers/term-id-getter'

class MissedVote extends NotificationScannerBaseModel {
Expand Down
2 changes: 1 addition & 1 deletion packages/services/src/workers/contract-monitor.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Etherscan from '../models/Etherscan'
import { DAYS } from '@aragon/protocol-backend-shared/build/helpers/times'
import getWalletFromPk from '@aragon/protocol-backend-shared/helpers/get-wallet-from-pk'
import getWalletFromPk from '@aragon/protocol-backend-shared/build/helpers/get-wallet-from-pk'
import abi from 'web3-eth-abi'

const TRANSACTION_TYPES = [
Expand Down
2 changes: 1 addition & 1 deletion packages/services/src/workers/heartbeat.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sleep from '@aragon/protocol-backend-shared/build/helpers/sleep'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'

const HEARTBEAT_TRIES_PER_JOB = 3
const SECONDS_BETWEEN_INTENTS = 3
Expand Down
6 changes: 3 additions & 3 deletions packages/services/src/workers/monitor-keeper.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import emailClient from '@aragon/protocol-backend-shared/build/helpers/email-client'
import Etherscan from '../models/Etherscan'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import { Admin, KeeperSuspiciousTransaction } from '@aragon/protocol-backend-shared/build/models/objection'

import { fromWei } from 'web3-utils'
import { bigExp } from '@aragon/protocol-backend-shared/helpers/numbers'
import getWalletFromPk from '@aragon/protocol-backend-shared/helpers/get-wallet-from-pk'
import { bigExp } from '@aragon/protocol-backend-shared/build/helpers/numbers'
import getWalletFromPk from '@aragon/protocol-backend-shared/build/helpers/get-wallet-from-pk'

const FROM = '[email protected]'
const BALANCE_THRESHOLD = bigExp(1, 17) // 0.1 ETH
Expand Down
2 changes: 1 addition & 1 deletion packages/services/src/workers/reveal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Reveal } from '@aragon/protocol-backend-shared/build/models/objection'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'

const REVEAL_TRIES = 3

Expand Down
2 changes: 1 addition & 1 deletion packages/services/src/workers/settlements.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import queries from '../helpers/settlement-queries'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'

export default async function (ctx) {
const { logger } = ctx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { userDbCleanup, userNotificationTypeDbCleanup } from '../../helpers/dbCl
import userNotificationTypeByModel from '../../helpers/userNotificationTypeByModel'
import { tryRunScanner } from '../../../src/workers/notification-scanner'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import * as termIdGetter from '../../../src/helpers/term-id-getter'

const { env: { CLIENT_URL } } = process
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { userDbCleanup, userNotificationTypeDbCleanup } from '../../helpers/dbCl
import userNotificationTypeByModel from '../../helpers/userNotificationTypeByModel'
import { tryRunScanner } from '../../../src/workers/notification-scanner'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'

const { env: { CLIENT_URL } } = process
const notificationTypeModel = 'DisputeRuled'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { userDbCleanup, userNotificationTypeDbCleanup } from '../../helpers/dbCl
import userNotificationTypeByModel from '../../helpers/userNotificationTypeByModel'
import { tryRunScanner } from '../../../src/workers/notification-scanner'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import * as termIdGetter from '../../../src/helpers/term-id-getter'

const { env: { CLIENT_URL } } = process
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { userDbCleanup, userNotificationTypeDbCleanup } from '../../helpers/dbCl
import userNotificationTypeByModel from '../../helpers/userNotificationTypeByModel'
import { tryRunScanner } from '../../../src/workers/notification-scanner'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'

const { env: { CLIENT_URL } } = process
const notificationTypeModel = 'GuardianDrafted'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { userDbCleanup, userNotificationTypeDbCleanup } from '../../helpers/dbCl
import userNotificationTypeByModel from '../../helpers/userNotificationTypeByModel'
import { tryRunScanner } from '../../../src/workers/notification-scanner'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import * as termIdGetter from '../../../src/helpers/term-id-getter'

const { env: { CLIENT_URL } } = process
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { userDbCleanup, userNotificationTypeDbCleanup } from '../../helpers/dbCl
import userNotificationTypeByModel from '../../helpers/userNotificationTypeByModel'
import { tryRunScanner } from '../../../src/workers/notification-scanner'
import { User } from '@aragon/protocol-backend-shared/build/models/objection'
import Network from '@aragon/protocol-backend-server/build/web3/Network'
import Network from '@aragon/protocol-backend-shared/build/web3/Network'
import * as termIdGetter from '../../../src/helpers/term-id-getter'

const { env: { CLIENT_URL } } = process
Expand Down
Loading