From 11bcfa05e37ec237f57c13f6c48565fc22049b08 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 12:03:07 +0200 Subject: [PATCH] Update remaining ../abi to @parity/abi --- js/src/api/contract/contract.spec.js | 3 ++- js/src/api/format/output.js | 3 ++- js/src/api/util/decode.js | 4 ++-- js/src/api/util/index.js | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/js/src/api/contract/contract.spec.js b/js/src/api/contract/contract.spec.js index bd8b0fbda..53889e320 100644 --- a/js/src/api/contract/contract.spec.js +++ b/js/src/api/contract/contract.spec.js @@ -17,9 +17,10 @@ import BigNumber from 'bignumber.js'; import sinon from 'sinon'; +import Abi from '@parity/abi'; + import { TEST_HTTP_URL, mockHttp } from '../../../test/mockRpc'; -import Abi from '../../abi'; import { sha3 } from '../util/sha3'; import Api from '../api'; diff --git a/js/src/api/format/output.js b/js/src/api/format/output.js index df40b59a0..ddb8b79f8 100644 --- a/js/src/api/format/output.js +++ b/js/src/api/format/output.js @@ -16,7 +16,8 @@ import BigNumber from 'bignumber.js'; -import { toChecksumAddress } from '../../abi/util/address'; +import { toChecksumAddress } from '@parity/abi/util/address'; + import { isString } from '../util/types'; export function outAccountInfo (infos) { diff --git a/js/src/api/util/decode.js b/js/src/api/util/decode.js index 926a5a8a1..995118a72 100644 --- a/js/src/api/util/decode.js +++ b/js/src/api/util/decode.js @@ -16,8 +16,8 @@ import { isHex } from './types'; -import Func from '../../abi/spec/function'; -import { fromParamType, toParamType } from '../../abi/spec/paramType/format'; +import Func from '@parity/abi/spec/function'; +import { fromParamType, toParamType } from '@parity/abi/spec/paramType/format'; export function decodeCallData (data) { if (!isHex(data)) { diff --git a/js/src/api/util/index.js b/js/src/api/util/index.js index cc8fc9b93..d174c3431 100644 --- a/js/src/api/util/index.js +++ b/js/src/api/util/index.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import { isAddress as isAddressValid, toChecksumAddress } from '../../abi/util/address'; +import { isAddress as isAddressValid, toChecksumAddress } from '@parity/abi/util/address'; + import { abiDecode, decodeCallData, decodeMethodInput, methodToAbi } from './decode'; import { abiEncode, abiUnencode, abiSignature, encodeMethodCallAbi } from './encode'; import { bytesToHex, hexToAscii, asciiToHex, cleanupValue } from './format';