Commit Graph

10 Commits

Author SHA1 Message Date
Gerardo Nardelli
7e651a86c4 Update oracle-e2e tests box contract addresses 2019-08-22 16:53:14 -03:00
Gerardo Nardelli
d22a3e8bae Merge branch 'master' into amb-oracle
# Conflicts:
#	.prettierrc
#	commons/abis.js
#	commons/package.json
#	e2e-commons/docker-compose.yml
#	monitor/eventsStats.js
#	monitor/utils/events.js
#	oracle/src/services/gasPrice.js
#	oracle/test/gasPrice.test.js
#	yarn.lock
2019-08-22 12:10:49 -03:00
Przemyslaw Rzad
2be0e9f363
Fix flaky UI-E2E (#178)
* Change user

* jobs

* Revert "Change user"

5fa7084f06e743f2981035d254a5ca287c41b02b

* Trying to use block generator address

* jobs

* Fixed

* 5 jobs

* 10 jobs

* all jobs

* finish

* Removed jobs

* Add funds for block generator in block genesis
2019-08-05 14:13:16 +02:00
Gerardo Nardelli
70d03c1a93 Oracle amb merge fix 2019-07-17 11:47:25 -03:00
rzadp
03ab7b44b6 Common url and network ID 2019-06-04 14:04:40 +02:00
rzadp
c86e956fa0 Common rpc url 2019-06-04 13:52:06 +02:00
rzadp
fddeb6869f Common token and parity rpc 2019-06-04 13:43:53 +02:00
rzadp
22937a9b0e Common bridge addresses, common second user, renamed constants.json to config 2019-06-04 13:27:21 +02:00
rzadp
23d109b84c Common validator 2019-06-04 12:58:36 +02:00
rzadp
13d49de5c6 Moved constant user from oracle-e2e to e2e-common 2019-06-04 10:51:34 +02:00