Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

move abis from js/json to contracts/abi #2418

Merged
merged 1 commit into from
Sep 30, 2016
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion js/src/contracts/registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import * as abis from '../json';
import * as abis from './abi';

export default class Registry {
constructor (api) {
Expand Down
1 change: 0 additions & 1 deletion js/src/contracts/tokenreg.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default class TokenReg {
constructor (api, registry) {
this._api = api;
this._registry = registry;
this._instance = null;

this.getInstance();
}
Expand Down
2 changes: 1 addition & 1 deletion js/src/dapps/gavcoin/Application/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const muiTheme = getMuiTheme(lightBaseTheme);

import { api } from '../parity';

import * as abis from '../../../json';
import * as abis from '../../../contracts/abi';

import Accounts from '../Accounts';
import Actions, { ActionBuyIn, ActionRefund, ActionTransfer } from '../Actions';
Expand Down
2 changes: 1 addition & 1 deletion js/src/dapps/registry/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import { registry as registryAbi } from '../../json';
import { registry as registryAbi } from '../../contracts/abi';

import { newContract, ethcore } from './parity.js';
import * as addresses from './addresses/actions.js';
Expand Down
2 changes: 1 addition & 1 deletion js/src/dapps/signaturereg/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import * as abis from '../../json';
import * as abis from '../../contracts/api';
import { api } from './parity';

const sortEvents = (a, b) => b.blockNumber.cmp(a.blockNumber) || b.logIndex.cmp(a.logIndex);
Expand Down
2 changes: 1 addition & 1 deletion js/src/dapps/tokenreg/Status/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
registry as registryAbi,
tokenreg as tokenregAbi,
githubhint as githubhintAbi
} from '../../../json';
} from '../../../contracts/abi';

import { loadToken, setTokenPending, deleteToken, setTokenData } from '../Tokens/actions';

Expand Down
2 changes: 1 addition & 1 deletion js/src/redux/providers/balances.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import { getBalances, getTokens } from './balancesActions';

import * as abis from '../../json';
import * as abis from '../../contracts/abi';

import imagesEthereum from '../../images/contracts/ethereum-56.png';
import imagesGavcoin from '../../images/contracts/gavcoin-56.png';
Expand Down