Moved contract wrapper abi tests into abi-gen package

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

Hide file tree

Showing 15 changed files with 257 additions and 14 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/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/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/compiler.json b/packages/abi-gen/compiler.json
@@ -23,5 +23,5 @@
             }
         }
     },
-    "contracts": ["AbiGenDummy.sol", "LibDummy.sol", "TestLibDummy.sol"]
+    "contracts": ["AbiGenDummy.sol", "LibDummy.sol", "TestLibDummy.sol", "TestAbi.sol"]
 }
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
@@ -40,7 +40,7 @@
         "contracts:gen": "contracts-gen"
     },
     "config": {
-        "abis": "./test-cli/fixtures/artifacts/@(AbiGenDummy|LibDummy|TestLibDummy).json",
+        "abis": "./test-cli/fixtures/artifacts/@(AbiGenDummy|LibDummy|TestLibDummy|TestAbi).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "bin": {

diff --git a/packages/abi-gen/test-cli/fixtures/artifacts/TestAbi.json b/packages/abi-gen/test-cli/fixtures/artifacts/TestAbi.json
diff --git a/contracts/utils/contracts/test/TestAbi.sol → ...n/test-cli/fixtures/contracts/TestAbi.sol b/contracts/utils/contracts/test/TestAbi.sol → ...n/test-cli/fixtures/contracts/TestAbi.sol
diff --git a/packages/abi-gen/test-cli/test_typescript/src/artifacts.ts b/packages/abi-gen/test-cli/test_typescript/src/artifacts.ts
@@ -8,8 +8,10 @@ import { ContractArtifact } from 'ethereum-types';
 import * as AbiGenDummy from '../../fixtures/artifacts/AbiGenDummy.json';
 import * as LibDummy from '../../fixtures/artifacts/LibDummy.json';
 import * as TestLibDummy from '../../fixtures/artifacts/TestLibDummy.json';
+import * as TestAbi from '../../fixtures/artifacts/TestAbi.json';
 export const artifacts = {
     AbiGenDummy: AbiGenDummy as ContractArtifact,
     LibDummy: LibDummy as ContractArtifact,
     TestLibDummy: TestLibDummy as ContractArtifact,
+    TestAbi: TestAbi as ContractArtifact,
 };
diff --git a/packages/abi-gen/test-cli/test_typescript/src/wrappers.ts b/packages/abi-gen/test-cli/test_typescript/src/wrappers.ts
@@ -6,3 +6,4 @@
 export * from '../../output/typescript/abi_gen_dummy';
 export * from '../../output/typescript/lib_dummy';
 export * from '../../output/typescript/test_lib_dummy';
+export * from '../../output/typescript/test_abi';
diff --git a/contracts/utils/test/abi.ts → ...-gen/test-cli/test_typescript/test/abi.ts b/contracts/utils/test/abi.ts → ...-gen/test-cli/test_typescript/test/abi.ts
diff --git a/packages/abi-gen/test-cli/tsconfig.json b/packages/abi-gen/test-cli/tsconfig.json
@@ -8,7 +8,8 @@
     "files": [
         "./fixtures/artifacts/AbiGenDummy.json",
         "./fixtures/artifacts/LibDummy.json",
-        "./fixtures/artifacts/TestLibDummy.json"
+        "./fixtures/artifacts/TestLibDummy.json",
+        "./fixtures/artifacts/TestAbi.json"
     ],
     "include": ["./output/typescript/**/*", "./test_typescript/**/*"]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,5 +23,5 @@ @@
                 }
             }
         },
-        "contracts": ["AbiGenDummy.sol", "LibDummy.sol", "TestLibDummy.sol"]
+        "contracts": ["AbiGenDummy.sol", "LibDummy.sol", "TestLibDummy.sol", "TestAbi.sol"]
     }