aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Agosti <francesco.agosti93@gmail.com>2018-07-26 07:32:04 +0800
committerGitHub <noreply@github.com>2018-07-26 07:32:04 +0800
commit6c5b33ec71edd0682af3875ee0dc20bb26529347 (patch)
tree79bb1376c5dfa9e3fc8951ec0b6f23e127b170cb
parent31b8dd1bfcd453d3867e2190aa237a05e19c4653 (diff)
parentda4b70fcae1da2c35905a30b79707b3f27b9fa3a (diff)
downloaddexon-0x-contracts-6c5b33ec71edd0682af3875ee0dc20bb26529347.tar.gz
dexon-0x-contracts-6c5b33ec71edd0682af3875ee0dc20bb26529347.tar.zst
dexon-0x-contracts-6c5b33ec71edd0682af3875ee0dc20bb26529347.zip
Merge pull request #902 from 0xProject/feature/web3-wrapper/unexport-marshaller
Stop exporting marshaller from web3-wrapper
-rw-r--r--packages/subproviders/src/subproviders/signer.ts3
-rw-r--r--packages/web3-wrapper/CHANGELOG.json4
-rw-r--r--packages/web3-wrapper/src/index.ts1
3 files changed, 6 insertions, 2 deletions
diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts
index d5fd86897..8abbb149a 100644
--- a/packages/subproviders/src/subproviders/signer.ts
+++ b/packages/subproviders/src/subproviders/signer.ts
@@ -1,4 +1,5 @@
-import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { marshaller } from '@0xproject/web3-wrapper/src/marshaller';
import { JSONRPCRequestPayload, Provider } from 'ethereum-types';
import { Callback, ErrorCallback } from '../types';
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
index 975f83037..74d34cd4a 100644
--- a/packages/web3-wrapper/CHANGELOG.json
+++ b/packages/web3-wrapper/CHANGELOG.json
@@ -22,6 +22,10 @@
"version": "1.0.0",
"changes": [
{
+ "note": "Stop exporting `marshaller` utility file.",
+ "pr": 902
+ },
+ {
"note": "Export `marshaller` utility file.",
"pr": 829
},
diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts
index 4433b4b54..6787e0102 100644
--- a/packages/web3-wrapper/src/index.ts
+++ b/packages/web3-wrapper/src/index.ts
@@ -1,3 +1,2 @@
export { Web3Wrapper } from './web3_wrapper';
export { Web3WrapperErrors, NodeType } from './types';
-export { marshaller } from './marshaller';