crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove read-only mode related code from integrations

Browse Source
This commit is contained in:
Amir Bandeali
2019-10-27 11:11:04 -07:00
parent 33a0c22021
commit 9312d5d9f7
3 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts
View File

@@ -138,11 +138,6 @@ blockchainTests('Deployment Manager', env => {
expect(isValid).to.be.true();
});
it('should have registered the read-only proxy in the staking proxy', async () => {
const readOnlyProxy = await deploymentManager.staking.stakingProxy.readOnlyProxy.callAsync();
expect(readOnlyProxy).to.be.eq(deploymentManager.staking.readOnlyProxy.address);
});
it('should have registered the staking contract in the staking proxy', async () => {
const stakingContract = await deploymentManager.staking.stakingProxy.stakingContract.callAsync();
expect(stakingContract).to.be.eq(deploymentManager.staking.stakingLogic.address);

22
contracts/integrations/test/internal-integration-tests/deployment_test.ts
View File

@@ -21,7 +21,6 @@ import { artifacts as multisigArtifacts, ZeroExGovernorContract } from '@0x/cont
import {
artifacts as stakingArtifacts,
constants as stakingConstants,
ReadOnlyProxyContract,
StakingContract,
StakingEvents,
StakingExchangeAddedEventArgs,
@@ -49,7 +48,6 @@ blockchainTests('Deployment and Configuration End to End Tests', env => {
let erc1155Proxy: ERC1155ProxyContract;
let exchange: ExchangeContract;
let multiAssetProxy: MultiAssetProxyContract;
let readOnlyProxy: ReadOnlyProxyContract;
let staking: StakingContract;
let staticCallProxy: StaticCallProxyContract;
let stakingProxy: StakingProxyContract;
@@ -100,14 +98,6 @@ blockchainTests('Deployment and Configuration End to End Tests', env => {
new BigNumber(chainId),
);
// Deploy ReadOnlyProxy.
readOnlyProxy = await ReadOnlyProxyContract.deployFrom0xArtifactAsync(
stakingArtifacts.ReadOnlyProxy,
env.provider,
txDefaults,
stakingArtifacts,
);
// Deploy Staking.
staking = await StakingContract.deployFrom0xArtifactAsync(
stakingArtifacts.Staking,
@@ -123,7 +113,6 @@ blockchainTests('Deployment and Configuration End to End Tests', env => {
txDefaults,
stakingArtifacts,
staking.address,
readOnlyProxy.address,
);
// Authorize owner in the staking proxy.
@@ -271,15 +260,7 @@ blockchainTests('Deployment and Configuration End to End Tests', env => {
});
describe('staking specific', () => {
it('should have properly configured the staking proxy with the logic contract and read-only proxy', async () => {
// Ensure that the registered read-only proxy is correct.
const readOnlyProxyAddress = await stakingProxy.readOnlyProxy.callAsync();
expect(readOnlyProxyAddress).to.be.eq(readOnlyProxy.address);
// Ensure that the registered read-only proxy callee is correct.
const readOnlyProxyCalleeAddress = await stakingProxy.readOnlyProxyCallee.callAsync();
expect(readOnlyProxyCalleeAddress).to.be.eq(staking.address);
it('should have properly configured the staking proxy with the logic contract', async () => {
// Ensure that the registered staking contract is correct.
const stakingAddress = await stakingProxy.stakingContract.callAsync();
expect(stakingAddress).to.be.eq(staking.address);
@@ -423,7 +404,6 @@ blockchainTests('Deployment and Configuration End to End Tests', env => {
it('should transfer ownership of all appropriate contracts to the asset-proxy owner', async () => {
// Transfer ownership of most contracts (we exclude contracts that are not ownable).
await transferOwnershipAndAssertSuccessAsync(exchange);
await transferOwnershipAndAssertSuccessAsync(readOnlyProxy);
await transferOwnershipAndAssertSuccessAsync(staking);
await transferOwnershipAndAssertSuccessAsync(stakingProxy);
await transferOwnershipAndAssertSuccessAsync(erc20Proxy);

11
contracts/integrations/test/utils/deployment_manager.ts
View File

@@ -24,7 +24,6 @@ import {
import { artifacts as multisigArtifacts, ZeroExGovernorContract } from '@0x/contracts-multisig';
import {
artifacts as stakingArtifacts,
ReadOnlyProxyContract,
StakingProxyContract,
TestStakingContract,
ZrxVaultContract,
@@ -97,7 +96,6 @@ interface AssetProxyContracts {
// Contract wrappers for all of the staking contracts
interface StakingContracts {
readOnlyProxy: ReadOnlyProxyContract;
stakingLogic: TestStakingContract;
stakingProxy: StakingProxyContract;
stakingWrapper: TestStakingContract;
@@ -199,7 +197,6 @@ export class DeploymentManager {
assetProxies.erc1155Proxy,
assetProxies.multiAssetProxy,
exchange,
staking.readOnlyProxy,
staking.stakingProxy,
]);
@@ -354,12 +351,6 @@ export class DeploymentManager {
assetProxies.erc20Proxy.address,
tokens.zrx.address,
);
const readOnlyProxy = await ReadOnlyProxyContract.deployFrom0xArtifactAsync(
stakingArtifacts.ReadOnlyProxy,
environment.provider,
txDefaults,
stakingArtifacts,
);
const stakingLogic = await TestStakingContract.deployFrom0xArtifactAsync(
stakingArtifacts.TestStaking,
environment.provider,
@@ -374,7 +365,6 @@ export class DeploymentManager {
txDefaults,
stakingArtifacts,
stakingLogic.address,
readOnlyProxy.address,
);
const stakingWrapper = new TestStakingContract(stakingProxy.address, environment.provider);
@@ -391,7 +381,6 @@ export class DeploymentManager {
await zrxVault.setStakingProxy.awaitTransactionSuccessAsync(stakingProxy.address, { from: owner });
return {
readOnlyProxy,
stakingLogic,
stakingProxy,
stakingWrapper,