Merge pull request #1315 from status-im/bump

bump submodules
status-im · Jul 14, 2020 · a82c38d · a82c38d
2 parents b0470d7 + 88a9629
commit a82c38d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/beacon_chain/validator_client.nim b/beacon_chain/validator_client.nim
@@ -10,7 +10,7 @@ import
   os, strutils, json, times,
 
   # Nimble packages
-  stew/byteutils, stew/shims/[tables, macros],
+  stew/shims/[tables, macros],
   chronos, confutils, metrics, json_rpc/[rpcclient, jsonmarshal],
   chronicles,
   blscurve, json_serialization/std/[options, sets, net],

diff --git a/docker/shared_testnet/README.md b/docker/shared_testnet/README.md
@@ -63,9 +63,9 @@ Periodic rebuilds and restarts are implemented using Cron jobs on the servers:
 10 0,6,12,18 * * * PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin'; cd /docker/beacon-node-testnet2-1; docker-compose --compatibility run --rm --name beacon-node-testnet2-1-build-run beacon_node --build; docker-compose restart -t 60
 ```
 
-Just the restart, using Ansible (not normally needed):
+The same, using Ansible (not normally needed):
 
 ```bash
-ansible nimbus-slaves[5:8] -i ansible/inventory/test -u YOUR_USER -o -m shell -a "echo; cd /docker/beacon-node-testnet2-1; docker-compose restart -t 60; echo '---'" | sed 's/\\n/\n/g'
+ansible nimbus-slaves[5:8] -i ansible/inventory/test -u YOUR_USER -o -m shell -a "echo; cd /docker/beacon-node-testnet2-1; docker-compose --compatibility run --rm --name beacon-node-testnet2-1-build-run beacon_node --build; docker-compose restart -t 60; echo '---'" | sed 's/\\n/\n/g'
 ```
 
diff --git a/tests/test_mainchain_monitor.nim b/tests/test_mainchain_monitor.nim
@@ -7,7 +7,7 @@ import
 
 type
   MockDataProvider = ref object of DataProvider
-    
+
 
 method getBlockByHash*(p: MockDataProvider, hash: BlockHash): Future[BlockObject] {.
   async

diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
diff --git a/vendor/nim-testutils b/vendor/nim-testutils
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ import @@
     type
       MockDataProvider = ref object of DataProvider
     method getBlockByHash*(p: MockDataProvider, hash: BlockHash): Future[BlockObject] {.
       async
@@ Expand Down @@
+2 −4		chronicles.nim
+8 −9		tests/loglevel/info_level.test
+11 −12		tests/loglevel/no_level.test
+8 −10		tests/loglevel/release_build_level.test
+6 −7		tests/loglevel/topic_log_level1.test
+7 −8		tests/loglevel/topic_log_level2.test
+4 −5		tests/loglevel/topic_log_level3.test
+5 −6		tests/loglevel/topic_log_level4.test
+3 −4		tests/loglevel/topic_log_level_none.test
+7 −8		tests/loglevel/topic_log_level_number.test
+3 −4		tests/loglevel/warn_level.test
+10 −11		tests/other/indent.test
+11 −12		tests/other/line_numbers.test
+2 −3		tests/sinks/custom_file_nocolors.test
+2 −3		tests/sinks/custom_file_notimestamps.test
+12 −14		tests/sinks/double_sink.test
+8 −6		tests/sinks/json_file_stdout.test
+12 −14		tests/sinks/property_per_sink.test
+54 −20		tests/sinks/textblocks_file_stdout.test
+6 −3		tests/sinks/textlines_file.test
+8 −6		tests/sinks/textlines_file_stdout.test
+2 −3		tests/sinks/textlines_stdout.test
+15 −18		tests/sinks/tripple_sink.test
+2 −3		tests/streams/xml_stream_usage.test
+8 −6		tests/timestamps/no_timestamps.test
+9 −9		tests/timestamps/ownpeg_timestamps.test
+8 −6		tests/timestamps/rfc_timestamps.test
+8 −6		tests/timestamps/unix_timestamps.test
+6 −7		tests/topics/disabled.test
+10 −11		tests/topics/enabled.test
+5 −6		tests/topics/enabled_vs_disabled.test
+7 −8		tests/topics/required1.test
+4 −5		tests/topics/required2.test
+5 −6		tests/topics/required_vs_disabled2.test