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,705 Commits 54 Branches 96 Tags 20 MiB
Commit Graph

1614 Commits

Author SHA1 Message Date
Iuri Matias 8fe9ccedf2 don't send message if process isn't connected 2018-06-13 14:56:26 -04:00
Iuri Matias 977b472217
Merge pull request #523 from embark-framework/bug_fix/bad-branch 
Fix callback already called on file download fail
 2018-06-13 14:42:08 -04:00
Jonathan Rainville e1c5487ba4 fix callback already called on file download fail 2018-06-13 14:37:15 -04:00
Iuri Matias d44021d7f9
Merge pull request #522 from embark-framework/zombie_fix 
track if couldn't send message to parent process
 2018-06-13 14:23:59 -04:00
Iuri Matias f1f4f2520c reset counter 2018-06-13 14:09:59 -04:00
Iuri Matias 9219c17924 return process send 2018-06-13 14:00:21 -04:00
Iuri Matias a62122a6d3 track if couldn't send message to parent process 2018-06-13 13:53:55 -04:00
Jonathan Rainville 8766c9b761 show warning if dependency is not deploying 2018-06-13 13:47:11 -04:00
Iuri Matias 3335483b1a
Merge pull request #520 from embark-framework/dashboard_performance_fix 
use neo blessed
 2018-06-13 11:44:47 -04:00
Iuri Matias 06eb0eda95
Merge pull request #517 from embark-framework/package_fix 
point to a forked npm package (for now), to avoid the npm install iss…
 2018-06-13 11:36:12 -04:00
Iuri Matias daaee7d828 use neo-blessed 2018-06-13 11:17:55 -04:00
Jonathan Rainville 8205f91802 enable loglevel for test logger and actually log 2018-06-13 09:44:19 -04:00
Iuri Matias 19aa117503 update references to package 2018-06-13 09:40:19 -04:00
Iuri Matias 735e72703b
Merge pull request #515 from embark-framework/jsonfix 
fix support for .json file in embark.json
 2018-06-12 18:03:43 -04:00
Iuri Matias aa01bd37a8
Merge pull request #514 from embark-framework/bug_fix/no-good-file 
stop test execution if file doesn't exist
 2018-06-12 18:01:06 -04:00
Iuri Matias 5ccbdbb41c
Merge pull request #513 from embark-framework/remove_backtrace 
remove anoying backtrace
 2018-06-12 18:00:02 -04:00
Iuri Matias 4131cf42ef fix support for .json file in embark.json 2018-06-12 17:59:14 -04:00
Jonathan Rainville 0f84fe2127 fix callback 2018-06-12 15:32:38 -04:00
Jonathan Rainville ef5e1e2707 stop test execution if file doesn't exist 2018-06-12 15:12:50 -04:00
Iuri Matias e6ed016cc0
Merge pull request #510 from embark-framework/gastimation 
Gastimation
 2018-06-12 14:11:28 -04:00
Iuri Matias e0ff5b3580 remove anoying backtrace 2018-06-12 13:58:21 -04:00
VoR0220 41f77793f4 more patchy mcpatchface 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:54:41 -05:00
VoR0220 3ede75ce50 Merge branch 'gastimation' of github.com:embark-framework/embark into gastimation 2018-06-12 12:52:36 -05:00
VoR0220 258d9b3fe0 patchy mcpatchface 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:52:23 -05:00
Iuri Matias a88513f58d Merge branch 'gastimation' of github.com:embark-framework/embark into gastimation 2018-06-12 13:24:30 -04:00
Iuri Matias 1dcd30b3a8 don't crash and instead inform user if contract cannot be profiled 2018-06-12 13:24:21 -04:00
VoR0220 acf67071c8 fix name 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:21:31 -05:00
VoR0220 cd67500dd1 minor cleanup 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:16:19 -05:00
VoR0220 539c035aa6 unnecessary declaration 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:14:02 -05:00
VoR0220 a601541bb0 get rid of one more line and get rid of unused cb 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:12:37 -05:00
VoR0220 43c8525d48 fix callbacks in gas estimator, add more fallback support and clean up console logs to better display potential errors 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 12:10:35 -05:00
Iuri Matias 5b1eeab7ed make debug a default api option 2018-06-12 12:21:46 -04:00
Iuri Matias 4ebeb86c3c
Merge pull request #506 from embark-framework/bug_fix/slow-pipeline 
Speed up the webpack process a little bit
 2018-06-12 12:15:02 -04:00
Iuri Matias 03870953a7
Merge pull request #508 from embark-framework/test_fixes 
warn if configured account has no funds
 2018-06-12 12:10:05 -04:00
Iuri Matias 79282f8d64
Merge branch 'develop' into bug_fix/slow-pipeline 2018-06-12 12:06:01 -04:00
Iuri Matias ad4c79390a
Merge pull request #504 from embark-framework/conn-proxy 
Proxy for inspecting function calls for contracts and retrieve trx information and display it on console
 2018-06-12 12:02:20 -04:00
VoR0220 e0470b8ef4 clean up junk and fix logger formatting 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:44:21 -05:00
VoR0220 335670f2ca package lock update and linting errors fixed 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:39:45 -05:00
VoR0220 57f098239d add support for null inputs and fallback and constructor types 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 0ff39f48b3 fix the callback schema for async and pretty it up a bit 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 90f342b65a redo logic so that it uses the async library 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 5c7e9f0054 changes to the logic around gas estimator and profiler 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 311ec7d9cb switch the keys around and make a few logical changes to the way things are structured. Currently stuck at method calling 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
VoR0220 fedbe0d2bc first attempt at gas estimation using a 3 round fuzzer and linking it into the profiler 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-12 10:36:41 -05:00
Richard Ramos 8f52dd4cf3 Missing semicolon 2018-06-12 10:15:54 -04:00
Richard Ramos a9065b1eae Websocket handling 2018-06-12 08:50:49 -04:00
Iuri Matias 787162575e
Merge pull request #507 from embark-framework/bug_fix/webpack-piling 
kill webpack processes when they are done
 2018-06-11 17:31:30 -04:00
Iuri Matias 56724aecd4 lint is king 2018-06-11 17:22:08 -04:00
Richard Ramos a50e7c25a9 Not all messages received are json objects 2018-06-11 16:46:57 -04:00
Richard Ramos 9e92069667 Fixing conflicts 2018-06-11 16:44:34 -04:00
Richard Ramos 03483052ea Adding error messages 2018-06-11 16:43:26 -04:00
Richard Ramos 38e6a9571d Updating tests 2018-06-11 16:43:26 -04:00
Richard Ramos 48a3f2afdc Fixing conflicts 2018-06-11 16:43:08 -04:00
Iuri Matias e46f6aa5b7 color output 2018-06-11 16:40:59 -04:00
Iuri Matias a4985fde40 make proxy mode the default 2018-06-11 16:40:59 -04:00
Richard Ramos 80052fc5e1 Displays json as a string in the console 2018-06-11 16:40:59 -04:00
Richard Ramos 6040509942 Adding line break 2018-06-11 16:40:59 -04:00
Richard Ramos f467fc5a31 Launching ipc connection depending on role 2018-06-11 16:40:59 -04:00
Richard Ramos 09c11662aa Removing unused variables 2018-06-11 16:40:59 -04:00
Richard Ramos 0f853ba841 Typo 2018-06-11 16:40:59 -04:00
Richard Ramos a669538e70 Adding proxy to config, and closing on error 2018-06-11 16:40:59 -04:00
Richard Ramos c9a2014ac7 Formatting input parameters 2018-06-11 16:40:59 -04:00
Richard Ramos 39d510cef4 Displaying status, gas and block number 2018-06-11 16:40:59 -04:00
Richard Ramos 8ef2dc124f Extracted console logging to its own file 2018-06-11 16:40:59 -04:00
Richard Ramos c1621c4029 Websocket support 2018-06-11 16:40:59 -04:00
Richard Ramos bf25381fa6 Rebasing changes from develop 2018-06-11 16:40:14 -04:00
Richard Ramos 05f5a145f1 Added proxy to blockchain 2018-06-11 16:38:29 -04:00
Richard Ramos 84c01c3197 Extracted proxy to its own file 2018-06-11 16:38:29 -04:00
Richard Ramos 339ffa5869 Adding proxy for simulator 2018-06-11 16:38:29 -04:00
Iuri Matias 20acb5425f remove comment 2018-06-11 16:34:41 -04:00
Jonathan Rainville 812cefafb1 kill processes when they are over 2018-06-11 15:55:57 -04:00
Iuri Matias 4aab8cd374 warn if configured account has no funds 2018-06-11 14:39:17 -04:00
Jonathan Rainville 046cb46ff4 move requires inside functions that need them 2018-06-11 14:36:52 -04:00
Iuri Matias 6b26f2a9d7 set default gas 2018-06-11 13:37:06 -04:00
Iuri Matias 8783f04a9c add node version of embarkjs to avoid export issues with webpack.. (for now...) 2018-06-10 12:55:59 -04:00
Iuri Matias c4ca4e52b8 support embarkjs in the tests 2018-06-10 12:11:34 -04:00
Iuri Matias c6e63af12d remove unneded param 2018-06-08 13:55:24 -04:00
Iuri Matias aff1dabb3a
Merge pull request #499 from embark-framework/dont_continue_on_errors 
Fix tests error reporting when there are deployment errors
 2018-06-08 13:02:13 -04:00
Iuri Matias 7fd7c770de
Merge pull request #501 from embark-framework/bug_fix/storage-message 
Put message if swarm or ipfs is not installed
 2018-06-08 12:55:29 -04:00
Iuri Matias cdfa30ebd2 remove listeners correctly 2018-06-08 12:51:04 -04:00
Iuri Matias 1b6ac99ea2 remove listeners to avoid leaks 2018-06-08 12:30:44 -04:00
Iuri Matias 33de740fff
Merge pull request #498 from embark-framework/single_test 
fix from and data options; add single test support
 2018-06-08 11:33:14 -04:00
Jonathan Rainville 0214447476 tigger build 2018-06-08 11:20:14 -04:00
Jonathan Rainville eecd719515 put message if swarm or ipfs is not installed 2018-06-08 10:40:01 -04:00
Iuri Matias 46e085b011 lint is king 2018-06-08 09:40:23 -04:00
Iuri Matias c8b52a1746 fix errors handling so it doesn't attempt to continue building when there are fatal errors compiling contracts 2018-06-08 07:07:27 -04:00
Iuri Matias 2efea55d2b lint is king 2018-06-08 06:17:51 -04:00
Iuri Matias ede4926069 don't continue testing file if there was deploy errors; avoids unrelated errors for each 'it' 2018-06-08 06:14:46 -04:00
Iuri Matias edbbaa160b make config params optional 2018-06-07 20:21:01 -04:00
Iuri Matias 402ee19722 default contracts fields 2018-06-07 20:20:24 -04:00
Iuri Matias 1c6df9db8d remove data parameter 2018-06-07 20:20:24 -04:00
Iuri Matias c1590d0b48 change deploy to beforeAll, so it takes priority over the test before 2018-06-07 20:20:24 -04:00
Iuri Matias 8fa7357d07 fix default from and data; add single test spec 2018-06-07 20:20:24 -04:00
Iuri Matias dd4088fd08
Merge pull request #480 from embark-framework/bug_fix/solc-loading-issue 
Updates console to inform user of an ongoing package download.
 2018-06-07 19:00:39 -04:00
Iuri Matias 9f0ab86c2d
Merge pull request #497 from embark-framework/features/test-connect-node 
Connect to a node in tests
 2018-06-07 18:59:27 -04:00
Jonathan Rainville e902c86ed2 conflicts in tests 2018-06-07 16:14:42 -04:00
Jonathan Rainville cbe456bf1e remove useless config 2018-06-07 16:09:54 -04:00
Jonathan Rainville a6a5bac053 use new provider when using account with a node specified 2018-06-07 16:07:58 -04:00
Jonathan Rainville 1b89199f50 fund accounts in wallet using contracts config 2018-06-07 13:06:09 -04:00
Jonathan Rainville 9c9bb761a4 add error when using deployAll 2018-06-07 13:01:13 -04:00
Jonathan Rainville a5ecd9f1f4 add tests for getBalance 2018-06-07 13:01:13 -04:00
Jonathan Rainville bb3e87d85e move getBalance in accountParser 2018-06-07 13:01:12 -04:00
Jonathan Rainville 3d70028cc5 fixing small stuff 2018-06-07 13:01:12 -04:00
Jonathan Rainville 2a61b2251c use web3 utils function instead 2018-06-07 13:01:12 -04:00
Jonathan Rainville 4ffb5c401f enable setting balance in mutliple formats 2018-06-07 13:01:12 -04:00
Jonathan Rainville 30a8263569 enable using accounts and balances 2018-06-07 13:01:12 -04:00
Jonathan Rainville ac631f90dc fix missing error callback 2018-06-07 13:01:12 -04:00
Jonathan Rainville bfc8663a61 change account funding order to enable starting a node before 2018-06-07 12:55:07 -04:00
Iuri Matias b5ac5626cb
Merge pull request #494 from embark-framework/missing_contract_name 
add missing variable
 2018-06-06 15:58:21 -04:00
Iuri Matias c4880535a4 add missing variable 2018-06-06 15:45:16 -04:00
Jonathan Rainville 435e5eba03 fix calling back with accounts 2018-06-06 13:54:20 -04:00
RJ Catalano 60e4f9f07d
Merge pull request #491 from embark-framework/alias_address 
alias address
 2018-06-06 12:16:21 -05:00
Iuri Matias a4196be958 alias address 2018-06-06 12:47:16 -04:00
Iuri Matias 1e4838d25a
Merge pull request #490 from embark-framework/fix_assert 
make assert global like before
 2018-06-06 11:24:27 -04:00
Iuri Matias e2f2c84aa2
Merge pull request #489 from embark-framework/avoid_zombies 
avoid sending messages to disconnected processes
 2018-06-06 11:24:16 -04:00
Iuri Matias ab20b10d5d use existing process send to avoid the extra if 2018-06-06 11:09:06 -04:00
Iuri Matias 6a10ef7187
Merge pull request #488 from embark-framework/default_account_fix 
fix setting default account
 2018-06-06 11:01:55 -04:00
Iuri Matias da6572bb11 make assert global like before 2018-06-06 11:00:30 -04:00
Iuri Matias 805091aa66
Merge pull request #482 from embark-framework/fuzzer 
Fuzzer
 2018-06-06 10:54:28 -04:00
Iuri Matias 2c2540417c avoid sending messages to disconnected processes 2018-06-06 10:42:06 -04:00
Iuri Matias cd6dcb7548 fix setting default account 2018-06-06 10:39:02 -04:00
emizzle 7e2f5624ba Increased time before reporting of library download duration goes red to 4 seconds. 
Incrased travis build version to node 8, as embark only supports 8.10, and also perf_hooks requires 8.5
 2018-06-06 12:04:30 +10:00
emizzle bbaf1676fb Updates console to inform user of an ongoing package download. 
Console message turns red after 1 second.
 2018-06-06 11:39:13 +10:00
Iuri Matias f44ed981b5
Merge pull request #481 from embark-framework/ipc 
add socket support
 2018-06-05 16:42:44 -04:00
Iuri Matias a41cf99be0 reverse condition 2018-06-05 16:13:17 -04:00
VoR0220 e42cbb4ade one last change 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 15:07:41 -05:00
VoR0220 95a06e0bf9 formatting fixes 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>

one more

Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 14:44:05 -05:00
VoR0220 773f5a7921 convert console logs to embark logger and this baby is ready to rock 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 14:16:38 -05:00
VoR0220 a7629d2ac0 fix linting 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:54:43 -05:00
Jonathan Rainville df3c5c2fd0 fix blockchain already booted 2018-06-05 14:39:18 -04:00
VoR0220 ffe26d052a some changes to the way randomness is calculated and getting rid of unnecessary garbage and added logging 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 28d1d585fe checkpoint 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 4858f8a19f convert to BN instead of number 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 2056a7e9ad finish engine addition 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 a0d0d9692b flesh it out further and add a console command and fix annoying bugs 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 7812951164 wip 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
VoR0220 f4bca2710f gas estimator and fuzzer 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-06-05 13:39:18 -05:00
Jonathan Rainville d3c4f6275c hotfix for zombie killer 2018-06-05 13:24:16 -04:00
Jonathan Rainville 6b941d09d2 fix typo 2018-06-05 12:15:47 -04:00
Jonathan Rainville 820fd45c46 remove killer code 2018-06-05 12:14:46 -04:00
Jonathan Rainville e49a474380 Ping parent and die when 3 errors 2018-06-05 12:09:57 -04:00
Iuri Matias 0e6d526ab4 comply with linter 2018-06-05 08:37:27 -04:00
Iuri Matias 85443959e0 remove unneded option 2018-06-05 08:04:27 -04:00
Eric Mastro c45fdb12df Improve storage logging (during --loglevel trace) 
Includes IPFS command run 
Includes response from IPFS/Swarm service checks
Includes url being checked during IPFS/Swarm service checks.
 2018-06-05 11:39:28 +10:00
Iuri Matias c0e559a7d9 assign roles so ipc connections don't conflict; fallback if can't connect to ipc 2018-06-04 18:15:37 -04:00
Iuri Matias a57bce2a40 refactor to use callbacks on ipc requests 2018-06-04 18:15:37 -04:00
Iuri Matias 37ade68804 debug console logs 2018-06-04 18:15:37 -04:00
Iuri Matias 1821e89346 refactor ipc to a module 2018-06-04 18:15:37 -04:00
Iuri Matias 6e37c2d91b only reply to compile action 2018-06-04 18:15:37 -04:00
Iuri Matias e96842f9da use .embark instead of /tmp 2018-06-04 18:15:37 -04:00
Iuri Matias b16c06025b use ipc for compiler 2018-06-04 18:15:37 -04:00
Jonathan Rainville b32c90b56e compile tests only once 2018-06-04 10:45:50 -04:00
Iuri Matias 6e424f36b0 use const instead of let 2018-06-02 10:06:58 -04:00
Iuri Matias 72e24f5e1b improve loading time by only doing require when needed 2018-06-02 09:54:32 -04:00
Iuri Matias 74df72fc0d lint is king 2018-06-01 19:35:41 -04:00
Iuri Matias 083961fc21 remove unneeded assignments 2018-06-01 19:32:14 -04:00
Iuri Matias 07e58bcd04 check window size in dashboard instead of index 2018-06-01 19:32:14 -04:00
Iuri Matias 60c687aa41 refactor storage module 2018-06-01 19:32:14 -04:00
Iuri Matias eadbeb0498 use monitor as a service 2018-06-01 19:32:14 -04:00
Iuri Matias 37d54e22db refactor services monitor to use events instead of passing addCheck around 2018-06-01 19:32:14 -04:00
Iuri Matias 0804779a20 don't sync i18n files anymore 2018-06-01 19:31:26 -04:00
Iuri Matias 0dbefad48b move requires to methods that actually need them 2018-06-01 19:30:51 -04:00
Iuri Matias a3de13e011 refactor to addPluginType 2018-06-01 19:30:51 -04:00
Iuri Matias 0282e7d71c
Merge pull request #476 from embark-framework/fix_events_limit_issue 
fix events limit issue
 2018-06-01 19:30:23 -04:00
Iuri Matias 2ade8cfd09 lint is king 2018-06-01 19:12:54 -04:00
Iuri Matias 17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Iuri Matias 152dfe2815 initialize web3 in the whisper module itself; use defined configuration 2018-06-01 18:11:23 -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 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 9a1eefc838
Merge branch 'develop' into features/improve-storage-config 2018-06-01 12:01:51 -04:00