Browse Source

Cleanup

develop
Ezerous 4 years ago
parent
commit
bea7dddff0
  1. 2
      src/accountBalances/accountBalancesSaga.js
  2. 2
      src/blocks/blocksSaga.js
  3. 2
      src/contracts/contractsSaga.js
  4. 4
      src/drizzleStatus/drizzleStatusSaga.js
  5. 2
      src/generateStore.js
  6. 2
      src/mergeOptions.js
  7. 2
      src/web3/web3Saga.js

2
src/accountBalances/accountBalancesSaga.js

@ -1,7 +1,7 @@
import { call, put, select, takeLatest } from 'redux-saga/effects' import { call, put, select, takeLatest } from 'redux-saga/effects'
import { import {
ACCOUNT_BALANCES_FAILED,
ACCOUNT_BALANCE_FETCHED, ACCOUNT_BALANCE_FETCHED,
ACCOUNT_BALANCES_FAILED,
ACCOUNT_BALANCES_FETCHED, ACCOUNT_BALANCES_FETCHED,
ACCOUNT_BALANCES_FETCHING ACCOUNT_BALANCES_FETCHING
} from './accountBalancesActions' } from './accountBalancesActions'

2
src/blocks/blocksSaga.js

@ -1,5 +1,5 @@
import { END, eventChannel } from 'redux-saga' import { END, eventChannel } from 'redux-saga'
import { call, put, take, takeEvery, takeLatest, all } from 'redux-saga/effects' import { all, call, put, take, takeEvery, takeLatest } from 'redux-saga/effects'
import * as BlocksActions from './blockActions' import * as BlocksActions from './blockActions'
/* /*

2
src/contracts/contractsSaga.js

@ -2,8 +2,6 @@ import { END, eventChannel } from 'redux-saga'
import { call, put, select, take, takeEvery } from 'redux-saga/effects' import { call, put, select, take, takeEvery } from 'redux-saga/effects'
import * as ContractActions from './constants' import * as ContractActions from './constants'
import * as TransactionsActions from '../transactions/transactionsActions' import * as TransactionsActions from '../transactions/transactionsActions'
import { ACCOUNTS_FAILED, ACCOUNTS_FETCHED, ACCOUNTS_FETCHING } from '../accounts/accountsActions'
import { getNetworkId } from '../web3/web3Saga'
/* /*
* Events * Events

4
src/drizzleStatus/drizzleStatusSaga.js

@ -1,13 +1,13 @@
import { call, put, takeLatest } from 'redux-saga/effects' import { call, put, takeLatest } from 'redux-saga/effects'
// Initialization Functions // Initialization Functions
import { initializeWeb3, getNetworkId } from '../web3/web3Saga' import { getNetworkId, initializeWeb3 } from '../web3/web3Saga'
import { getAccounts } from '../accounts/accountsSaga' import { getAccounts } from '../accounts/accountsSaga'
import { getAccountBalances } from '../accountBalances/accountBalancesSaga' import { getAccountBalances } from '../accountBalances/accountBalancesSaga'
import * as DrizzleActions from './drizzleActions' import * as DrizzleActions from './drizzleActions'
import * as BlocksActions from '../blocks/blockActions' import * as BlocksActions from '../blocks/blockActions'
import { NETWORK_ID_CHANGED, NETWORK_IDS, NETWORK_MISMATCH } from '../web3/web3Actions' import { NETWORK_IDS, NETWORK_MISMATCH } from '../web3/web3Actions'
import { CONTRACT_NOT_DEPLOYED } from '../contracts/constants' import { CONTRACT_NOT_DEPLOYED } from '../contracts/constants'
import { isContractDeployed } from '../contracts/contractsSaga' import { isContractDeployed } from '../contracts/contractsSaga'

2
src/generateStore.js

@ -1,5 +1,5 @@
import { all, fork } from 'redux-saga/effects' import { all, fork } from 'redux-saga/effects'
import { createStore, applyMiddleware, compose, combineReducers } from 'redux' import { applyMiddleware, combineReducers, compose, createStore } from 'redux'
import createSagaMiddleware from 'redux-saga' import createSagaMiddleware from 'redux-saga'
import drizzleSagas from './rootSaga' import drizzleSagas from './rootSaga'
import drizzleReducers from './reducer' import drizzleReducers from './reducer'

2
src/mergeOptions.js

@ -1,5 +1,5 @@
const merge = require('deepmerge'); const merge = require('deepmerge');
import isPlainObject from 'is-plain-object'; import isPlainObject from 'is-plain-object'
export default function (defaultOptions, newOptions) { export default function (defaultOptions, newOptions) {
return merge(defaultOptions, newOptions, { return merge(defaultOptions, newOptions, {

2
src/web3/web3Saga.js

@ -1,4 +1,4 @@
import { call, put, takeLatest } from 'redux-saga/effects' import { call, put } from 'redux-saga/effects'
import * as Action from './web3Actions' import * as Action from './web3Actions'
const Web3 = require('web3'); const Web3 = require('web3');

Loading…
Cancel
Save