@0x/contracts-dev-utils: Move D18 out to @0x/contracts-utils.

0xProject · Feb 19, 2020 · e851cb1 · e851cb1
1 parent 3da03da
commit e851cb1
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 262 deletions.
diff --git a/contracts/dev-utils/CHANGELOG.json b/contracts/dev-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "1.2.0",
+        "changes": [
+            {
+                "note": "Add `DydxBridge` order validation",
+                "pr": 2466
+            }
+        ]
+    },
     {
         "timestamp": 1581748629,
         "version": "1.1.1",
@@ -18,14 +27,6 @@
             {
                 "note": "Remove `LibTransactionDecoder` export",
                 "pr": 2464
-            },
-            {
-                "note": "Add `DydxBridge` order validation",
-                "pr": 2466
-            },
-            {
-                "note": "Add `D18` library for working with base-10, 18-precision decimals",
-                "pr": 2466
             }
         ],
         "timestamp": 1581204851

diff --git a/contracts/dev-utils/contracts/src/D18.sol b/contracts/dev-utils/contracts/src/D18.sol
diff --git a/contracts/dev-utils/contracts/src/LibDydxBalance.sol b/contracts/dev-utils/contracts/src/LibDydxBalance.sol
@@ -26,8 +26,8 @@ import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
 import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
+import "@0x/contracts-utils/contracts/src/D18.sol";
 import "./LibAssetData.sol";
-import "./D18.sol";
 
 
 library LibDydxBalance {

diff --git a/contracts/dev-utils/package.json b/contracts/dev-utils/package.json
@@ -28,7 +28,7 @@
     },
     "config": {
         "publicInterfaceContracts": "DevUtils,LibAssetData,LibDydxBalance,LibOrderTransferSimulation,LibTransactionDecoder",
-        "abis": "./test/generated-artifacts/@(Addresses|AssetBalance|D18|DevUtils|EthBalanceChecker|ExternalFunctions|LibAssetData|LibDydxBalance|LibOrderTransferSimulation|LibTransactionDecoder|OrderTransferSimulationUtils|OrderValidationUtils|TestDydx|TestLibDydxBalance).json",
+        "abis": "./test/generated-artifacts/@(Addresses|AssetBalance|DevUtils|EthBalanceChecker|ExternalFunctions|LibAssetData|LibDydxBalance|LibOrderTransferSimulation|LibTransactionDecoder|OrderTransferSimulationUtils|OrderValidationUtils|TestDydx|TestLibDydxBalance).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

diff --git a/contracts/dev-utils/test/artifacts.ts b/contracts/dev-utils/test/artifacts.ts
@@ -7,7 +7,6 @@ import { ContractArtifact } from 'ethereum-types';
 
 import * as Addresses from '../test/generated-artifacts/Addresses.json';
 import * as AssetBalance from '../test/generated-artifacts/AssetBalance.json';
-import * as D18 from '../test/generated-artifacts/D18.json';
 import * as DevUtils from '../test/generated-artifacts/DevUtils.json';
 import * as EthBalanceChecker from '../test/generated-artifacts/EthBalanceChecker.json';
 import * as ExternalFunctions from '../test/generated-artifacts/ExternalFunctions.json';
@@ -22,7 +21,6 @@ import * as TestLibDydxBalance from '../test/generated-artifacts/TestLibDydxBala
 export const artifacts = {
     Addresses: Addresses as ContractArtifact,
     AssetBalance: AssetBalance as ContractArtifact,
-    D18: D18 as ContractArtifact,
     DevUtils: DevUtils as ContractArtifact,
     EthBalanceChecker: EthBalanceChecker as ContractArtifact,
     ExternalFunctions: ExternalFunctions as ContractArtifact,

diff --git a/contracts/dev-utils/test/wrappers.ts b/contracts/dev-utils/test/wrappers.ts
@@ -5,7 +5,6 @@
  */
 export * from '../test/generated-wrappers/addresses';
 export * from '../test/generated-wrappers/asset_balance';
-export * from '../test/generated-wrappers/d18';
 export * from '../test/generated-wrappers/dev_utils';
 export * from '../test/generated-wrappers/eth_balance_checker';
 export * from '../test/generated-wrappers/external_functions';

diff --git a/contracts/dev-utils/tsconfig.json b/contracts/dev-utils/tsconfig.json
@@ -10,7 +10,6 @@
         "generated-artifacts/LibTransactionDecoder.json",
         "test/generated-artifacts/Addresses.json",
         "test/generated-artifacts/AssetBalance.json",
-        "test/generated-artifacts/D18.json",
         "test/generated-artifacts/DevUtils.json",
         "test/generated-artifacts/EthBalanceChecker.json",
         "test/generated-artifacts/ExternalFunctions.json",