@0x/contracts-zero-ex: Remove UniswapFeature

`@0x/contracts-zero-ex`: Fix broken tests.

contracts/zero-ex/contracts/src/features/IUniswapV2Feature.sol

@@ -1,49 +0,0 @@
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6.5;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-
-
-/// @dev Feature for directly interacting with Uniswap V2
-interface IUniswapV2Feature {
-
-    function sellToUniswapV2(
-        IERC20TokenV06 inputToken,
-        IERC20TokenV06 outputToken,
-        uint256 inputTokenAmount,
-        uint256 minOutputTokenAmount,
-        address recipient,
-    )
-        external
-        payable
-        returns (uint256 outputTokenAmount);
-
-    function buyFromUniswapV2(
-        IERC20TokenV06 inputToken,
-        IERC20TokenV06 outputToken,
-        uint256 maxInputTokenAmount,
-        uint256 outputTokenAmount,
-        address recipient,
-    )
-        external
-        payable
-        returns (uint256 inputTokenAmount);
-}

contracts/zero-ex/package.json

@@ -41,7 +41,7 @@
     "config": {
         "publicInterfaceContracts": "IZeroEx,ZeroEx,FullMigration,InitialMigration,IFlashWallet,IAllowanceTarget,IERC20Transformer,IOwnableFeature,ISimpleFunctionRegistryFeature,ITokenSpenderFeature,ITransformERC20Feature,FillQuoteTransformer,PayTakerTransformer,WethTransformer,OwnableFeature,SimpleFunctionRegistryFeature,TransformERC20Feature,TokenSpenderFeature,AffiliateFeeTransformer,SignatureValidatorFeature,MetaTransactionsFeature,LogMetadataTransformer,BridgeAdapter",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(AffiliateFeeTransformer|AllowanceTarget|BootstrapFeature|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinGasToken|FixinReentrancyGuard|FlashWallet|FullMigration|IAllowanceTarget|IBootstrapFeature|IERC20Bridge|IERC20Transformer|IExchange|IFeature|IFlashWallet|IGasToken|IMetaTransactionsFeature|IOwnableFeature|ISignatureValidatorFeature|ISimpleFunctionRegistryFeature|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapV2Feature|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC20Transformer|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignatureRichErrors|LibSignedCallData|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibSpenderRichErrors|LibStorage|LibTokenSpenderStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LogMetadataTransformer|MetaTransactionsFeature|OwnableFeature|PayTakerTransformer|SignatureValidatorFeature|SimpleFunctionRegistryFeature|TestCallTarget|TestDelegateCaller|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFullMigration|TestInitialMigration|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC20Token|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestTokenSpender|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestWeth|TestWethTransformerHost|TestZeroExFeature|TokenSpenderFeature|TransformERC20Feature|Transformer|TransformerDeployer|WethTransformer|ZeroEx).json"
+        "abis": "./test/generated-artifacts/@(AffiliateFeeTransformer|AllowanceTarget|BootstrapFeature|BridgeAdapter|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinReentrancyGuard|FlashWallet|FullMigration|IAllowanceTarget|IBootstrapFeature|IBridgeAdapter|IERC20Bridge|IERC20Transformer|IExchange|IFeature|IFlashWallet|IGasToken|IMetaTransactionsFeature|IOwnableFeature|ISignatureValidatorFeature|ISimpleFunctionRegistryFeature|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC20Transformer|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignatureRichErrors|LibSignedCallData|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibSpenderRichErrors|LibStorage|LibTokenSpenderStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LogMetadataTransformer|MetaTransactionsFeature|MixinAdapterAddresses|MixinBalancer|MixinCurve|MixinKyber|MixinMStable|MixinOasis|MixinUniswap|MixinUniswapV2|MixinZeroExBridge|OwnableFeature|PayTakerTransformer|SignatureValidatorFeature|SimpleFunctionRegistryFeature|TestCallTarget|TestDelegateCaller|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFullMigration|TestInitialMigration|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC20Token|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestTokenSpender|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestWeth|TestWethTransformerHost|TestZeroExFeature|TokenSpenderFeature|TransformERC20Feature|Transformer|TransformerDeployer|WethTransformer|ZeroEx).json"
     },
     "repository": {
         "type": "git",

contracts/zero-ex/test/artifacts.ts

@@ -7,8 +7,8 @@ import { ContractArtifact } from 'ethereum-types';
 
 import * as AffiliateFeeTransformer from '../test/generated-artifacts/AffiliateFeeTransformer.json';
 import * as AllowanceTarget from '../test/generated-artifacts/AllowanceTarget.json';
-import * as BridgeAdapter from '../test/generated-artifacts/BridgeAdapter.json';
 import * as BootstrapFeature from '../test/generated-artifacts/BootstrapFeature.json';
+import * as BridgeAdapter from '../test/generated-artifacts/BridgeAdapter.json';
 import * as FillQuoteTransformer from '../test/generated-artifacts/FillQuoteTransformer.json';
 import * as FixinCommon from '../test/generated-artifacts/FixinCommon.json';
 import * as FixinEIP712 from '../test/generated-artifacts/FixinEIP712.json';
@@ -16,8 +16,8 @@ import * as FixinReentrancyGuard from '../test/generated-artifacts/FixinReentran
 import * as FlashWallet from '../test/generated-artifacts/FlashWallet.json';
 import * as FullMigration from '../test/generated-artifacts/FullMigration.json';
 import * as IAllowanceTarget from '../test/generated-artifacts/IAllowanceTarget.json';
-import * as IBridgeAdapter from '../test/generated-artifacts/IBridgeAdapter.json';
 import * as IBootstrapFeature from '../test/generated-artifacts/IBootstrapFeature.json';
+import * as IBridgeAdapter from '../test/generated-artifacts/IBridgeAdapter.json';
 import * as IERC20Bridge from '../test/generated-artifacts/IERC20Bridge.json';
 import * as IERC20Transformer from '../test/generated-artifacts/IERC20Transformer.json';
 import * as IExchange from '../test/generated-artifacts/IExchange.json';
@@ -32,7 +32,6 @@ import * as ISimpleFunctionRegistryFeature from '../test/generated-artifacts/ISi
 import * as ITestSimpleFunctionRegistryFeature from '../test/generated-artifacts/ITestSimpleFunctionRegistryFeature.json';
 import * as ITokenSpenderFeature from '../test/generated-artifacts/ITokenSpenderFeature.json';
 import * as ITransformERC20Feature from '../test/generated-artifacts/ITransformERC20Feature.json';
-import * as IUniswapV2Feature from '../test/generated-artifacts/IUniswapV2Feature.json';
 import * as IZeroEx from '../test/generated-artifacts/IZeroEx.json';
 import * as LibBootstrap from '../test/generated-artifacts/LibBootstrap.json';
 import * as LibCommonRichErrors from '../test/generated-artifacts/LibCommonRichErrors.json';
@@ -56,6 +55,7 @@ import * as LibTransformERC20RichErrors from '../test/generated-artifacts/LibTra
 import * as LibTransformERC20Storage from '../test/generated-artifacts/LibTransformERC20Storage.json';
 import * as LibWalletRichErrors from '../test/generated-artifacts/LibWalletRichErrors.json';
 import * as LogMetadataTransformer from '../test/generated-artifacts/LogMetadataTransformer.json';
+import * as MetaTransactionsFeature from '../test/generated-artifacts/MetaTransactionsFeature.json';
 import * as MixinAdapterAddresses from '../test/generated-artifacts/MixinAdapterAddresses.json';
 import * as MixinBalancer from '../test/generated-artifacts/MixinBalancer.json';
 import * as MixinCurve from '../test/generated-artifacts/MixinCurve.json';
@@ -65,7 +65,6 @@ import * as MixinOasis from '../test/generated-artifacts/MixinOasis.json';
 import * as MixinUniswap from '../test/generated-artifacts/MixinUniswap.json';
 import * as MixinUniswapV2 from '../test/generated-artifacts/MixinUniswapV2.json';
 import * as MixinZeroExBridge from '../test/generated-artifacts/MixinZeroExBridge.json';
-import * as MetaTransactionsFeature from '../test/generated-artifacts/MetaTransactionsFeature.json';
 import * as OwnableFeature from '../test/generated-artifacts/OwnableFeature.json';
 import * as PayTakerTransformer from '../test/generated-artifacts/PayTakerTransformer.json';
 import * as SignatureValidatorFeature from '../test/generated-artifacts/SignatureValidatorFeature.json';
@@ -135,7 +134,6 @@ export const artifacts = {
     ISimpleFunctionRegistryFeature: ISimpleFunctionRegistryFeature as ContractArtifact,
     ITokenSpenderFeature: ITokenSpenderFeature as ContractArtifact,
     ITransformERC20Feature: ITransformERC20Feature as ContractArtifact,
-    IUniswapV2Feature: IUniswapV2Feature as ContractArtifact,
     MetaTransactionsFeature: MetaTransactionsFeature as ContractArtifact,
     OwnableFeature: OwnableFeature as ContractArtifact,
     SignatureValidatorFeature: SignatureValidatorFeature as ContractArtifact,

contracts/zero-ex/test/features/meta_transactions_test.ts

@@ -301,7 +301,7 @@ blockchainTests.resets('MetaTransactions feature', env => {
                 new ZeroExRevertErrors.MetaTransactions.MetaTransactionCallFailedError(
                     mtxHash,
                     actualCallData,
-                    new StringRevertError('FAIL').toString(),
+                    new StringRevertError('FAIL').encode(),
                 ),
             );
         });
@@ -469,7 +469,7 @@ blockchainTests.resets('MetaTransactions feature', env => {
                         mtxHash,
                         signers[0],
                         signature,
-                    ).toString(),
+                    ).encode(),
                 ),
             );
         });

contracts/zero-ex/test/features/ownable_test.ts

@@ -102,7 +102,7 @@ blockchainTests.resets('Ownable feature', env => {
             return expect(tx).to.revertWith(
                 new ZeroExRevertErrors.Ownable.MigrateCallFailedError(
                     testMigrator.address,
-                    new StringRevertError('OOPSIE').toString(),
+                    new StringRevertError('OOPSIE').encode(),
                 ),
             );
         });

contracts/zero-ex/test/features/token_spender_test.ts

@@ -98,7 +98,7 @@ blockchainTests.resets('TokenSpender feature', env => {
                 tokenFrom,
                 tokenTo,
                 tokenAmount,
-                new StringRevertError('TestTokenSpenderERC20Token/Revert').toString(),
+                new StringRevertError('TestTokenSpenderERC20Token/Revert').encode(),
             );
             return expect(tx).to.revertWith(expectedError);
         });

contracts/zero-ex/test/flash_wallet_test.ts

@@ -127,7 +127,7 @@ blockchainTests.resets('FlashWallet', env => {
                     callTarget.address,
                     REVERTING_DATA,
                     constants.ZERO_AMOUNT,
-                    new StringRevertError('TestCallTarget/REVERT').toString(),
+                    new StringRevertError('TestCallTarget/REVERT'),
                 ),
             );
         });
@@ -203,7 +203,7 @@ blockchainTests.resets('FlashWallet', env => {
                     wallet.address,
                     callTarget.address,
                     REVERTING_DATA,
-                    new StringRevertError('TestCallTarget/REVERT').toString(),
+                    new StringRevertError('TestCallTarget/REVERT'),
                 ),
             );
         });

contracts/zero-ex/test/wrappers.ts

@@ -5,7 +5,7 @@
  */
 export * from '../test/generated-wrappers/affiliate_fee_transformer';
 export * from '../test/generated-wrappers/allowance_target';
-export * from '../test/generated-wrappers/bootstrap';
+export * from '../test/generated-wrappers/bootstrap_feature';
 export * from '../test/generated-wrappers/bridge_adapter';
 export * from '../test/generated-wrappers/fill_quote_transformer';
 export * from '../test/generated-wrappers/fixin_common';
@@ -14,7 +14,7 @@ export * from '../test/generated-wrappers/fixin_reentrancy_guard';
 export * from '../test/generated-wrappers/flash_wallet';
 export * from '../test/generated-wrappers/full_migration';
 export * from '../test/generated-wrappers/i_allowance_target';
-export * from '../test/generated-wrappers/i_bootstrap';
+export * from '../test/generated-wrappers/i_bootstrap_feature';
 export * from '../test/generated-wrappers/i_bridge_adapter';
 export * from '../test/generated-wrappers/i_erc20_bridge';
 export * from '../test/generated-wrappers/i_erc20_transformer';
@@ -22,13 +22,13 @@ export * from '../test/generated-wrappers/i_exchange';
 export * from '../test/generated-wrappers/i_feature';
 export * from '../test/generated-wrappers/i_flash_wallet';
 export * from '../test/generated-wrappers/i_gas_token';
-export * from '../test/generated-wrappers/i_meta_transactions';
+export * from '../test/generated-wrappers/i_meta_transactions_feature';
-export * from '../test/generated-wrappers/i_ownable';
+export * from '../test/generated-wrappers/i_ownable_feature';
-export * from '../test/generated-wrappers/i_signature_validator';
+export * from '../test/generated-wrappers/i_signature_validator_feature';
-export * from '../test/generated-wrappers/i_simple_function_registry';
+export * from '../test/generated-wrappers/i_simple_function_registry_feature';
 export * from '../test/generated-wrappers/i_test_simple_function_registry_feature';
-export * from '../test/generated-wrappers/i_token_spender';
+export * from '../test/generated-wrappers/i_token_spender_feature';
-export * from '../test/generated-wrappers/i_transform_erc20';
+export * from '../test/generated-wrappers/i_transform_erc20_feature';
 export * from '../test/generated-wrappers/i_zero_ex';
 export * from '../test/generated-wrappers/initial_migration';
 export * from '../test/generated-wrappers/lib_bootstrap';
@@ -53,7 +53,7 @@ export * from '../test/generated-wrappers/lib_transform_erc20_rich_errors';
 export * from '../test/generated-wrappers/lib_transform_erc20_storage';
 export * from '../test/generated-wrappers/lib_wallet_rich_errors';
 export * from '../test/generated-wrappers/log_metadata_transformer';
-export * from '../test/generated-wrappers/meta_transactions';
+export * from '../test/generated-wrappers/meta_transactions_feature';
 export * from '../test/generated-wrappers/mixin_adapter_addresses';
 export * from '../test/generated-wrappers/mixin_balancer';
 export * from '../test/generated-wrappers/mixin_curve';
@@ -63,10 +63,10 @@ export * from '../test/generated-wrappers/mixin_oasis';
 export * from '../test/generated-wrappers/mixin_uniswap';
 export * from '../test/generated-wrappers/mixin_uniswap_v2';
 export * from '../test/generated-wrappers/mixin_zero_ex_bridge';
-export * from '../test/generated-wrappers/ownable';
+export * from '../test/generated-wrappers/ownable_feature';
 export * from '../test/generated-wrappers/pay_taker_transformer';
-export * from '../test/generated-wrappers/signature_validator';
+export * from '../test/generated-wrappers/signature_validator_feature';
-export * from '../test/generated-wrappers/simple_function_registry';
+export * from '../test/generated-wrappers/simple_function_registry_feature';
 export * from '../test/generated-wrappers/test_call_target';
 export * from '../test/generated-wrappers/test_delegate_caller';
 export * from '../test/generated-wrappers/test_fill_quote_transformer_bridge';
@@ -89,8 +89,8 @@ export * from '../test/generated-wrappers/test_transformer_host';
 export * from '../test/generated-wrappers/test_weth';
 export * from '../test/generated-wrappers/test_weth_transformer_host';
 export * from '../test/generated-wrappers/test_zero_ex_feature';
-export * from '../test/generated-wrappers/token_spender';
+export * from '../test/generated-wrappers/token_spender_feature';
-export * from '../test/generated-wrappers/transform_erc20';
+export * from '../test/generated-wrappers/transform_erc20_feature';
 export * from '../test/generated-wrappers/transformer';
 export * from '../test/generated-wrappers/transformer_deployer';
 export * from '../test/generated-wrappers/weth_transformer';

contracts/zero-ex/tsconfig.json

@@ -28,8 +28,8 @@
         "generated-artifacts/ZeroEx.json",
         "test/generated-artifacts/AffiliateFeeTransformer.json",
         "test/generated-artifacts/AllowanceTarget.json",
-        "test/generated-artifacts/BridgeAdapter.json",
         "test/generated-artifacts/BootstrapFeature.json",
+        "test/generated-artifacts/BridgeAdapter.json",
         "test/generated-artifacts/FillQuoteTransformer.json",
         "test/generated-artifacts/FixinCommon.json",
         "test/generated-artifacts/FixinEIP712.json",
@@ -37,6 +37,7 @@
         "test/generated-artifacts/FlashWallet.json",
         "test/generated-artifacts/FullMigration.json",
         "test/generated-artifacts/IAllowanceTarget.json",
+        "test/generated-artifacts/IBootstrapFeature.json",
         "test/generated-artifacts/IBridgeAdapter.json",
         "test/generated-artifacts/IERC20Bridge.json",
         "test/generated-artifacts/IERC20Transformer.json",
@@ -51,7 +52,6 @@
         "test/generated-artifacts/ITestSimpleFunctionRegistryFeature.json",
         "test/generated-artifacts/ITokenSpenderFeature.json",
         "test/generated-artifacts/ITransformERC20Feature.json",
-        "test/generated-artifacts/IUniswapV2Feature.json",
         "test/generated-artifacts/IZeroEx.json",
         "test/generated-artifacts/InitialMigration.json",
         "test/generated-artifacts/LibBootstrap.json",
@@ -76,6 +76,7 @@
         "test/generated-artifacts/LibTransformERC20Storage.json",
         "test/generated-artifacts/LibWalletRichErrors.json",
         "test/generated-artifacts/LogMetadataTransformer.json",
+        "test/generated-artifacts/MetaTransactionsFeature.json",
         "test/generated-artifacts/MixinAdapterAddresses.json",
         "test/generated-artifacts/MixinBalancer.json",
         "test/generated-artifacts/MixinCurve.json",
@@ -85,8 +86,6 @@
         "test/generated-artifacts/MixinUniswap.json",
         "test/generated-artifacts/MixinUniswapV2.json",
         "test/generated-artifacts/MixinZeroExBridge.json",
-        "test/generated-artifacts/Ownable.json",
-        "test/generated-artifacts/MetaTransactionsFeature.json",
         "test/generated-artifacts/OwnableFeature.json",
         "test/generated-artifacts/PayTakerTransformer.json",
         "test/generated-artifacts/SignatureValidatorFeature.json",