Minor changes

This commit is contained in:
The MMGen Project 2019-02-14 14:33:58 +00:00
commit 39e63bd75f
3 changed files with 5 additions and 4 deletions

View file

@ -51,7 +51,7 @@ dependencies:
*Note: Ubuntu Xenial users will have to upgrade the Python interpreter and
Python dependencies listed in the [Install wiki][iw] from version 3.5 to 3.6
before proceeding. This can be done by adding the Bionic repository to
'sources.list' and installing the relevant packages with '-t bionic'*
'sources.list' and reinstalling the relevant packages with '-t bionic'*
$ sudo -H pip3 install wheel future pysha3 PyYAML py_ecc rlp
@ -148,7 +148,7 @@ Clone the repository and build:
$ git clone --recursive https://github.com/ethereum/solidity.git
$ cd solidity
$ git checkout v0.5.1 # v0.5.3 doesn't build on Raspbian Stretch
$ git checkout v0.5.1 # or v0.5.3, if not Raspbian Stretch
$ ./scripts/install_deps.sh # Raspbian Stretch: add `DISTRO='Debian'` after line 55
$ mkdir build
$ cd build

View file

@ -86,7 +86,7 @@ def segwit_is_active(exit_on_error=False):
d = g.rpch.getblockchaininfo()
if d['chain'] == 'regtest':
return True
if ( 'bip9_softforks' in d
if ( 'bip9_softforks' in d
and 'segwit' in d['bip9_softforks']
and d['bip9_softforks']['segwit']['status'] == 'active'):
return True

View file

@ -161,7 +161,8 @@ def match_error(sec,wif,a_addr,b_addr,a,b):
def compare_test():
for k in ('segwit','compressed'):
if addr_type.name == k and g.coin not in ci.external_tests_segwit_compressed[k]:
msg('{} testing not supported for coin {}'.format(addr_type.name.capitalize(),g.coin))
m = 'skipping - external program does not support {} for coin {}'
msg(m.format(addr_type.name.capitalize(),g.coin))
return
if 'ext_lib' in globals():
if g.coin not in ci.external_tests[('mainnet','testnet')[g.testnet]][ext_lib]: