Moved contract wrapper abi tests into abi-gen package

0xProject · Jul 31, 2019 · 118818b · 118818b
1 parent 35c3455
commit 118818b
Show file tree

Hide file tree

Showing 15 changed files with 1,159 additions and 269 deletions.
diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json
@@ -9,11 +9,6 @@
             {
                 "note": "Added tests for decoding log arguments when artifact dependencies are included/excluded.",
                 "pr": 1995
-            },
-
-            {
-                "note": "Added tests for`getABIDecodedTransactionData` and `getABIDecodedReturnData` in contract wrappers.",
-                "pr": 2018
             }
         ]
     },

diff --git a/contracts/utils/compiler.json b/contracts/utils/compiler.json
@@ -30,7 +30,6 @@
         "src/ReentrancyGuard.sol",
         "src/SafeMath.sol",
         "src/interfaces/IOwnable.sol",
-        "test/TestAbi.sol",
         "test/TestConstants.sol",
         "test/TestLibAddressArray.sol",
         "test/TestLibBytes.sol",

diff --git a/contracts/utils/contracts/test/TestAbi.sol b/contracts/utils/contracts/test/TestAbi.sol
diff --git a/contracts/utils/package.json b/contracts/utils/package.json
@@ -34,7 +34,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(Address|IOwnable|LibBytes|Ownable|ReentrancyGuard|SafeMath|TestAbi|TestConstants|TestLibAddressArray|TestLibBytes|TestLogDecoding|TestLogDecodingDownstream).json",
+        "abis": "./generated-artifacts/@(Address|IOwnable|LibBytes|Ownable|ReentrancyGuard|SafeMath|TestConstants|TestLibAddressArray|TestLibBytes|TestLogDecoding|TestLogDecodingDownstream).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

diff --git a/contracts/utils/src/artifacts.ts b/contracts/utils/src/artifacts.ts
@@ -11,7 +11,6 @@ import * as LibBytes from '../generated-artifacts/LibBytes.json';
 import * as Ownable from '../generated-artifacts/Ownable.json';
 import * as ReentrancyGuard from '../generated-artifacts/ReentrancyGuard.json';
 import * as SafeMath from '../generated-artifacts/SafeMath.json';
-import * as TestAbi from '../generated-artifacts/TestAbi.json';
 import * as TestConstants from '../generated-artifacts/TestConstants.json';
 import * as TestLibAddressArray from '../generated-artifacts/TestLibAddressArray.json';
 import * as TestLibBytes from '../generated-artifacts/TestLibBytes.json';
@@ -29,5 +28,4 @@ export const artifacts = {
     TestLibBytes: TestLibBytes as ContractArtifact,
     TestLogDecoding: TestLogDecoding as ContractArtifact,
     TestLogDecodingDownstream: TestLogDecodingDownstream as ContractArtifact,
-    TestAbi: TestAbi as ContractArtifact,
 };
diff --git a/contracts/utils/src/wrappers.ts b/contracts/utils/src/wrappers.ts
@@ -9,7 +9,6 @@ export * from '../generated-wrappers/lib_bytes';
 export * from '../generated-wrappers/ownable';
 export * from '../generated-wrappers/reentrancy_guard';
 export * from '../generated-wrappers/safe_math';
-export * from '../generated-wrappers/test_abi';
 export * from '../generated-wrappers/test_constants';
 export * from '../generated-wrappers/test_lib_address_array';
 export * from '../generated-wrappers/test_lib_bytes';

diff --git a/contracts/utils/test/abi.ts b/contracts/utils/test/abi.ts
diff --git a/contracts/utils/tsconfig.json b/contracts/utils/tsconfig.json
@@ -9,7 +9,6 @@
         "generated-artifacts/Ownable.json",
         "generated-artifacts/ReentrancyGuard.json",
         "generated-artifacts/SafeMath.json",
-        "generated-artifacts/TestAbi.json",
         "generated-artifacts/TestConstants.json",
         "generated-artifacts/TestLibAddressArray.json",
         "generated-artifacts/TestLibBytes.json",

diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json
@@ -5,6 +5,10 @@
             {
                 "note": "Updated expected typescript output for cli tests to include `getABIDecodedTransactionData` and `getABIDecodedReturnData`",
                 "pr": 2018
+            },
+            {
+                "note": "Added tests for`getABIDecodedTransactionData` and `getABIDecodedReturnData` in contract wrappers.",
+                "pr": 2018
             }
         ]
     },

diff --git a/packages/abi-gen/README.md b/packages/abi-gen/README.md
@@ -110,7 +110,7 @@ The files in `test-cli/` are used to test the CLI output against a set of dummy
 Compile dummy contracts and generate wrappers:
 
 ```
-yarn test_cli:prebuild
+yarn compile:sol
 ```
 
 Build generated wrappers and unit tests: