seasharp/basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix osx gitian path.

Browse Source
This commit is contained in:
tecnovert 2019-07-27 22:13:35 +02:00
parent 7ccf191192
commit 682fe578a7
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -20,6 +20,7 @@ script:
- export PARTICL_BINDIR=/opt/binaries/particl-0.18.0.12/bin/ - export PARTICL_BINDIR=/opt/binaries/particl-0.18.0.12/bin/
- export BITCOIN_BINDIR=/opt/binaries/bitcoin-0.18.0/bin/ - export BITCOIN_BINDIR=/opt/binaries/bitcoin-0.18.0/bin/
- export LITECOIN_BINDIR=/opt/binaries/litecoin-0.17.1/bin/ - export LITECOIN_BINDIR=/opt/binaries/litecoin-0.17.1/bin/
- TEST_DIR=/tmp/test_basicswap/
- mkdir -p ${TEST_DIR}/bin/{particl,bitcoin} - mkdir -p ${TEST_DIR}/bin/{particl,bitcoin}
- cp /opt/binaries/bitcoin-0.18.0-x86_64-linux-gnu.tar.gz ${TEST_DIR}/bin/bitcoin - cp /opt/binaries/bitcoin-0.18.0-x86_64-linux-gnu.tar.gz ${TEST_DIR}/bin/bitcoin
- python setup.py test - python setup.py test

8
bin/basicswap_prepare.py
View File

@ -97,22 +97,22 @@ def prepareCore(coin, version, settings, data_dir):
signing_key_name = 'tecnovert' signing_key_name = 'tecnovert'
release_url = 'https://github.com/particl/particl-core/releases/download/v{}/{}'.format(version, release_filename) release_url = 'https://github.com/particl/particl-core/releases/download/v{}/{}'.format(version, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version) assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version)
assert_url = 'https://raw.githubusercontent.com/particl/gitian.sigs/master/%s-%s/%s/%s' % (version, os_name, signing_key_name, assert_filename) assert_url = 'https://raw.githubusercontent.com/particl/gitian.sigs/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
elif coin == 'litecoin': elif coin == 'litecoin':
signing_key_name = 'thrasher' signing_key_name = 'thrasher'
release_url = 'https://download.litecoin.org/litecoin-{}/{}/{}'.format(version, os_name, release_filename) release_url = 'https://download.litecoin.org/litecoin-{}/{}/{}'.format(version, os_name, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0]) assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
assert_url = 'https://raw.githubusercontent.com/litecoin-project/gitian.sigs.ltc/master/%s-%s/%s/%s' % (version, os_name, signing_key_name, assert_filename) assert_url = 'https://raw.githubusercontent.com/litecoin-project/gitian.sigs.ltc/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
elif coin == 'bitcoin': elif coin == 'bitcoin':
signing_key_name = 'laanwj' signing_key_name = 'laanwj'
release_url = 'https://bitcoincore.org/bin/bitcoin-core-{}/{}'.format(version, release_filename) release_url = 'https://bitcoincore.org/bin/bitcoin-core-{}/{}'.format(version, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0]) assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
assert_url = 'https://raw.githubusercontent.com/bitcoin-core/gitian.sigs/master/%s-%s/%s/%s' % (version, os_name, signing_key_name, assert_filename) assert_url = 'https://raw.githubusercontent.com/bitcoin-core/gitian.sigs/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
elif coin == 'namecoin': elif coin == 'namecoin':
signing_key_name = 'JeremyRand' signing_key_name = 'JeremyRand'
release_url = 'https://beta.namecoin.org/files/namecoin-core/namecoin-core-{}/{}'.format(version, release_filename) release_url = 'https://beta.namecoin.org/files/namecoin-core/namecoin-core-{}/{}'.format(version, release_filename)
assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0]) assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
assert_url = 'https://raw.githubusercontent.com/namecoin/gitian.sigs/master/%s-%s/%s/%s' % (version, os_name, signing_key_name, assert_filename) assert_url = 'https://raw.githubusercontent.com/namecoin/gitian.sigs/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
else: else:
raise ValueError('Unknown coin') raise ValueError('Unknown coin')

2
doc/install.md
View File

@ -37,8 +37,8 @@ Before running docker-compose build
## Install as Python Module with PIP ## Install as Python Module with PIP
$ cd basicswap $ cd basicswap
$ pip3 install .
$ protoc -I=basicswap --python_out=basicswap basicswap/messages.proto $ protoc -I=basicswap --python_out=basicswap basicswap/messages.proto
$ pip3 install .
$ basicswap-prepare $ basicswap-prepare
$ basicswap-run $ basicswap-run

2
tests/basicswap/__init__.py
View File

@ -3,6 +3,7 @@ import unittest
import tests.basicswap.test_other as test_other import tests.basicswap.test_other as test_other
import tests.basicswap.test_prepare as test_prepare import tests.basicswap.test_prepare as test_prepare
import tests.basicswap.test_run as test_run import tests.basicswap.test_run as test_run
import tests.basicswap.test_reload as test_reload
def test_suite(): def test_suite():
@ -10,5 +11,6 @@ def test_suite():
suite = loader.loadTestsFromModule(test_other) suite = loader.loadTestsFromModule(test_other)
suite.addTests(loader.loadTestsFromModule(test_prepare)) suite.addTests(loader.loadTestsFromModule(test_prepare))
suite.addTests(loader.loadTestsFromModule(test_run)) suite.addTests(loader.loadTestsFromModule(test_run))
suite.addTests(loader.loadTestsFromModule(test_reload))
return suite return suite