Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove sub-dockerfiles and sub-contracts #54

Merged
merged 41 commits into from
May 22, 2019
Merged

Conversation

rzadp
Copy link
Contributor

@rzadp rzadp commented May 21, 2019

Purpose

The purpose of this PR is to:

Achieved work

  • oracle-e2e and ui-e2e share parity config in root directory
  • oracle-e2e uses contracts in root directory
  • ui-e2e uses contracts in root directory
  • Reduced number of Dockerfiles
  • Made ui-e2e work on CI - closes Extract bridge-ui/e2e and configure CircleCI #6

Contracts issues

@rzadp rzadp added oracle related to TokenBridge oracle UI related to TokenBridge UI labels May 21, 2019
Copy link
Collaborator

@akolotov akolotov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@patitonar please take a look as well

oracle/README.md Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
oracle-e2e/deploy.js Outdated Show resolved Hide resolved
ui-e2e/scripts/deploy.js Outdated Show resolved Hide resolved
@akolotov
Copy link
Collaborator

@patitonar do you have understanding why the e2e on UI side does not work with the contracts v2.2.0? I see that the difference between v2.1.0 and v2.2.0 is almost nothing from the UI point of view.

@rzadp
Copy link
Contributor Author

rzadp commented May 22, 2019

@patitonar do you have understanding why the e2e on UI side does not work with the contracts v2.2.0? I see that the difference between v2.1.0 and v2.2.0 is almost nothing from the UI point of view.

I didn't spend time to look into this yesterday as I wanted to roll out the PR for review sooner. Maybe I'll be able to figure this out today.

@akolotov
Copy link
Collaborator

@patitonar do you have understanding why the e2e on UI side does not work with the contracts v2.2.0? I see that the difference between v2.1.0 and v2.2.0 is almost nothing from the UI point of view.

I didn't spend time to look into this yesterday as I wanted to roll out the PR for review sooner. Maybe I'll be able to figure this out today.

I think I found the difference. The following must be updated in ui-e2e/envs/contracts.env, ui-e2e/envs/erc-contracts.env, ui-e2e/envs/erc-native-contracts.env:

  • DEPLOYMENT_GAS_LIMIT=5000000
  • HOME_OWNER_MULTISIG, HOME_UPGRADEABLE_ADMIN_VALIDATORS, HOME_UPGRADEABLE_ADMIN_BRIDGE must be updated to HOME_BRIDGE_OWNER, HOME_VALIDATORS_OWNER and HOME_UPGRADEABLE_ADMIN
  • FOREIGN_OWNER_MULTISIG, FOREIGN_UPGRADEABLE_ADMIN_VALIDATORS, FOREIGN_UPGRADEABLE_ADMIN_BRIDGE must be updated to FOREIGN_BRIDGE_OWNER, FOREIGN_VALIDATORS_OWNER, FOREIGN_UPGRADEABLE_ADMIN

After that the contracts v2.2.0 should work for both set of e2e tests.

@patitonar
Copy link
Contributor

oracle-e2e and ui-e2e should be able to work with 2.3.0-rc0. The reason is that there are some .env variables that need to be added/updated.

Some of these variables probably need to be added in some on the env files and some on others env files:

DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
HOME_REWARDABLE=false
FOREIGN_REWARDABLE=false
VALIDATORS_REWARD_ACCOUNTS=0x0000000000000000000000000000000000000000
DEPLOY_REWARDABLE_TOKEN=false
ERC20_EXTENDED_BY_ERC677=false
BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000
DPOS_STAKING_ADDRESS=0x0000000000000000000000000000000000000000

Copy link
Collaborator

@akolotov akolotov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove duplicated DEPLOYMENT_GAS_LIMIT parameter in the files located in ui-e2e/envs

ui-e2e/envs/contracts.env Outdated Show resolved Hide resolved
ui-e2e/envs/erc-contracts.env Outdated Show resolved Hide resolved
ui-e2e/envs/erc-native-contracts.env Outdated Show resolved Hide resolved
@akolotov
Copy link
Collaborator

@patitonar could you check one more time and approve the PR? thanks!

@akolotov akolotov merged commit 97f80dc into master May 22, 2019
@akolotov akolotov deleted the dockerfile-and-contracts branch May 22, 2019 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
e2e related to end to end testing oracle related to TokenBridge oracle shared shared components UI related to TokenBridge UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Extract bridge-ui/e2e and configure CircleCI
3 participants