status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,380 Commits 54 Branches 96 Tags 20 MiB
Commit Graph

2380 Commits

Author SHA1 Message Date
Iuri Matias 17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Iuri Matias 061ff51f83
Merge pull request #475 from embark-framework/fix/pipeline-not-building 
fix pipeline not building by removing the `once`s
 2018-06-01 18:12:23 -04:00
Iuri Matias 152dfe2815 initialize web3 in the whisper module itself; use defined configuration 2018-06-01 18:11:23 -04:00
Iuri Matias 8d985ce60a fix tests; put back solc 0.4.24 2018-06-01 18:09:54 -04:00
Jonathan Rainville 876a9a3103 fix pipeline not building by removing the `once`s 2018-06-01 15:48:10 -04:00
Jonathan Rainville 91b8033ab5 fix using deployedAddress instead of address 2018-06-01 14:12:10 -04:00
Jonathan Rainville aa04279a6f Merge branch 'features/test-revamp-multi' of https://github.com/embark-framework/embark into features/test-revamp-multi 
# Conflicts:
#	lib/contracts/contract_deployer.js
#	lib/i18n/locales/en.json
#	lib/tests/test.js
#	package-lock.json
 2018-06-01 13:57:39 -04:00
Jonathan Rainville b727d85358 small fixes 2018-06-01 13:53:09 -04:00
Jonathan Rainville 57a194d20d remove timer 2018-06-01 13:44:54 -04:00
Jonathan Rainville 61a518f569 remove initCOnfig in tests because useless 2018-06-01 13:44:54 -04:00
Jonathan Rainville f3d55f6742 patch weird event max listeners bug 2018-06-01 13:44:54 -04:00
Jonathan Rainville 73fca42ce1 fix error messages for non deployed contracts 2018-06-01 13:44:54 -04:00
Jonathan Rainville d76ab75c4a remove initTest 2018-06-01 13:44:54 -04:00
Jonathan Rainville 88889a1a9d update test_app tests 2018-06-01 13:44:53 -04:00
Jonathan Rainville 2d1a37d63b conflict in pakcgae lock 2018-06-01 13:44:49 -04:00
Jonathan Rainville 33bd52e9ec add id to solc process to avoid multiple callback calls 2018-06-01 13:44:35 -04:00
Jonathan Rainville 5fb4e3330c conflict in packagelock 2018-06-01 13:44:30 -04:00
Jonathan Rainville dbb2352928 fix contracts that are instances of 2018-06-01 13:44:14 -04:00
Jonathan Rainville 6712fc294c change another storage test 2018-06-01 13:44:14 -04:00
Jonathan Rainville beb0df8985 make running config() without callback work 2018-06-01 13:44:14 -04:00
Jonathan Rainville ab92457319 fix missing default from 2018-06-01 13:43:48 -04:00
Jonathan Rainville 4040c1eec9 use object assign to assign new values to contract 2018-06-01 13:43:48 -04:00
Jonathan Rainville 8664570d7c conflict in test 2018-06-01 13:43:43 -04:00
Jonathan Rainville d0a289a450 conflict in deployManager 2018-06-01 13:42:05 -04:00
Jonathan Rainville b97c85d5f4 conflict in tests 2018-06-01 13:41:12 -04:00
Jonathan Rainville 3555575ff9 change another storage test 2018-06-01 13:35:58 -04:00
Jonathan Rainville 049af73294 make running config() without callback work 2018-06-01 13:35:58 -04:00
Jonathan Rainville 491ff47cf8 conflict in en.json 2018-06-01 13:35:52 -04:00
Jonathan Rainville d647ea791e fix missing default from 2018-06-01 13:35:18 -04:00
Jonathan Rainville 72da3b4a35 use object assign to assign new values to contract 2018-06-01 13:35:18 -04:00
Jonathan Rainville a1d32e72e7 conflict in deployManager 2018-06-01 13:35:15 -04:00
Jonathan Rainville 9dcb64bde3 conflict in deployManager 2018-06-01 13:34:23 -04:00
Jonathan Rainville c234655acd resolve conflict in test.js 2018-06-01 13:33:11 -04:00
Jonathan Rainville 723a4ae805 reformat run_test 2018-06-01 13:32:23 -04:00
Jonathan Rainville ed1a2c4ddb remove timer 2018-06-01 13:31:22 -04:00
Jonathan Rainville 10f55910d2 remove initCOnfig in tests because useless 2018-06-01 13:30:08 -04:00
Jonathan Rainville 7cab30f4df patch weird event max listeners bug 2018-06-01 13:29:51 -04:00
Iuri Matias 4669922090
Merge pull request #471 from embark-framework/features/improve-storage-config 
Improve storage config
 2018-06-01 12:07:30 -04:00
Iuri Matias 9a1eefc838
Merge branch 'develop' into features/improve-storage-config 2018-06-01 12:01:51 -04:00
Iuri Matias d2b41be908
Merge pull request #472 from embark-framework/remove_orbit 
remove orbit
 2018-06-01 12:00:07 -04:00
Jonathan Rainville e5ec461f78 fix error messages for non deployed contracts 2018-06-01 11:30:02 -04:00
Jonathan Rainville eeb88010d5 remove initTest 2018-06-01 11:06:07 -04:00
Jonathan Rainville 55df42979f update test_app tests 2018-06-01 10:48:29 -04:00
Iuri Matias f3e7d03204 remove orbit 2018-06-01 10:15:41 -04:00
Jonathan Rainville a112f18d93 always deploy contracts when in tests and make all test work 2018-06-01 10:05:43 -04:00
Eric Mastro 421f9a4096 Merge in remote 2018-06-01 14:10:54 +10:00
emizzle 74d5ee3984 small fixes 2018-06-01 14:06:02 +10:00
emizzle 446f28ed6f de-dupe en.json 2018-06-01 13:39:00 +10:00
emizzle a11047c681 Further fixes for starting dappConnection processes automatically 
moved storage process launching to storage module

refactored all cases of storage url building to util methods

updated cors so that a processes will not include itself in cors list

changed child process command console output to trace, so it's visible when --logLevel == trace
 2018-06-01 13:36:46 +10:00
emizzle 927f562a41 Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes. 
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json

Current WIP is auto-starting storage processes defined in dappConnection config.
 2018-06-01 13:35:25 +10:00