Exchange Integration Tests

0xProject · Mar 6, 2019 · 403a815 · 403a815
1 parent c0eef21
commit 403a815
Show file tree

Hide file tree

Showing 6 changed files with 415 additions and 2 deletions.
diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json
@@ -19,10 +19,12 @@
         }
     },
     "contracts": [
+        "@0x/contracts-asset-proxy/contracts/src/ERC1155Proxy.sol",
         "@0x/contracts-asset-proxy/contracts/src/ERC20Proxy.sol",
         "@0x/contracts-asset-proxy/contracts/src/ERC721Proxy.sol",
-        "@0x/contracts-asset-proxy/contracts/src/ERC1155Proxy.sol",
         "@0x/contracts-asset-proxy/contracts/src/MultiAssetProxy.sol",
+        "@0x/contracts-erc1155/contracts/src/ERC1155Mintable.sol",
+        "@0x/contracts-erc1155/contracts/test/DummyERC1155Receiver.sol",
         "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
         "@0x/contracts-erc20/contracts/test/DummyNoReturnERC20Token.sol",
         "@0x/contracts-erc20/contracts/test/ReentrantERC20Token.sol",

diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json
@@ -33,7 +33,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IValidator|IWallet|IWrapperFunctions|MultiAssetProxy|ReentrantERC20Token|TestAssetProxyDispatcher|TestExchangeInternals|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist).json",
+        "abis": "./generated-artifacts/@(DummyERC1155Receiver|DummyERC20Token|DummyERC721Token|DummyNoReturnERC20Token|ERC1155Mintable|ERC1155Proxy|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IValidator|IWallet|IWrapperFunctions|MultiAssetProxy|ReentrantERC20Token|TestAssetProxyDispatcher|TestExchangeInternals|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

diff --git a/contracts/exchange/src/artifacts.ts b/contracts/exchange/src/artifacts.ts
@@ -5,9 +5,12 @@
  */
 import { ContractArtifact } from 'ethereum-types';
 
+import * as DummyERC1155Receiver from '../generated-artifacts/DummyERC1155Receiver.json';
 import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
 import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
 import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json';
+import * as ERC1155Mintable from '../generated-artifacts/ERC1155Mintable.json';
+import * as ERC1155Proxy from '../generated-artifacts/ERC1155Proxy.json';
 import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json';
 import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
 import * as Exchange from '../generated-artifacts/Exchange.json';
@@ -32,13 +35,16 @@ import * as Validator from '../generated-artifacts/Validator.json';
 import * as Wallet from '../generated-artifacts/Wallet.json';
 import * as Whitelist from '../generated-artifacts/Whitelist.json';
 export const artifacts = {
+    ERC1155Proxy: ERC1155Proxy as ContractArtifact,
     ERC20Proxy: ERC20Proxy as ContractArtifact,
     ERC721Proxy: ERC721Proxy as ContractArtifact,
     MultiAssetProxy: MultiAssetProxy as ContractArtifact,
     DummyERC20Token: DummyERC20Token as ContractArtifact,
     DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
     ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
     DummyERC721Token: DummyERC721Token as ContractArtifact,
+    ERC1155Mintable: ERC1155Mintable as ContractArtifact,
+    DummyERC1155Receiver: DummyERC1155Receiver as ContractArtifact,
     TestLibs: TestLibs as ContractArtifact,
     ExchangeWrapper: ExchangeWrapper as ContractArtifact,
     Validator: Validator as ContractArtifact,

diff --git a/contracts/exchange/src/wrappers.ts b/contracts/exchange/src/wrappers.ts
@@ -3,9 +3,12 @@
  * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
  * -----------------------------------------------------------------------------
  */
+export * from '../generated-wrappers/dummy_erc1155_receiver';
 export * from '../generated-wrappers/dummy_erc20_token';
 export * from '../generated-wrappers/dummy_erc721_token';
 export * from '../generated-wrappers/dummy_no_return_erc20_token';
+export * from '../generated-wrappers/erc1155_mintable';
+export * from '../generated-wrappers/erc1155_proxy';
 export * from '../generated-wrappers/erc20_proxy';
 export * from '../generated-wrappers/erc721_proxy';
 export * from '../generated-wrappers/exchange';