Merge branch 'develop' of github.com:cakedefi/defichain into develop

DeFiCh · Jul 17, 2020 · ace45d5 · ace45d5
2 parents fbe6c0e + afd9b90
commit ace45d5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ For more information:
 - Visit the [DeFi Blockchain website](https://defichain.io)
 - Read our [white paper](https://defichain.io/white-paper/)
 
-Official binaries are available from the [GitHub Releases](https://github.com/DeFiCh/ain/releases) page. 
+Downloadable binaries are available from the [GitHub Releases](https://github.com/DeFiCh/ain/releases) page. 
 
 ### Bitcoin Core
 

diff --git a/contrib/dockerfiles/dockerhub/x86_64-pc-linux-gnu.dockerfile b/contrib/dockerfiles/dockerhub/x86_64-pc-linux-gnu.dockerfile
@@ -17,4 +17,3 @@ USER defi:defi
 CMD [ "/app/bin/defid" ]
 
 EXPOSE 8555 8554 18555 18554 19555 19554
-
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
@@ -19,7 +19,7 @@
 """
 
 from decimal import Decimal
-import http.client
+# import http.client
 import subprocess
 
 from test_framework.test_framework import DefiTestFramework
@@ -288,7 +288,7 @@ def _test_stopatheight(self):
         assert_raises(subprocess.TimeoutExpired, lambda: self.nodes[0].process.wait(timeout=3))
         try:
             self.nodes[0].generate(1)
-        except (ConnectionError, http.client.BadStatusLine):
+        except: # (ConnectionError, http.client.BadStatusLine): # pass on ANY exception
             pass  # The node already shut down before response
         self.log.debug('Node should stop at this height...')
         self.nodes[0].wait_until_stopped()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,3 @@ USER defi:defi
		CMD [ "/app/bin/defid" ]

		EXPOSE 8555 8554 18555 18554 19555 19554