From 682fe578a7c7b2d93bed854a162f44608037a7cd Mon Sep 17 00:00:00 2001
From: tecnovert <tecnovert@tecnovert.net>
Date: Sat, 27 Jul 2019 22:13:35 +0200
Subject: [PATCH] Fix osx gitian path.

---
 .travis.yml                 | 1 +
 bin/basicswap_prepare.py    | 8 ++++----
 doc/install.md              | 2 +-
 tests/basicswap/__init__.py | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 547e3dc..79844c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ script:
   - export PARTICL_BINDIR=/opt/binaries/particl-0.18.0.12/bin/
   - export BITCOIN_BINDIR=/opt/binaries/bitcoin-0.18.0/bin/
   - export LITECOIN_BINDIR=/opt/binaries/litecoin-0.17.1/bin/
+  - TEST_DIR=/tmp/test_basicswap/
   - mkdir -p ${TEST_DIR}/bin/{particl,bitcoin}
   - cp /opt/binaries/bitcoin-0.18.0-x86_64-linux-gnu.tar.gz ${TEST_DIR}/bin/bitcoin
   - python setup.py test
diff --git a/bin/basicswap_prepare.py b/bin/basicswap_prepare.py
index 1078bd4..6a08ab7 100644
--- a/bin/basicswap_prepare.py
+++ b/bin/basicswap_prepare.py
@@ -97,22 +97,22 @@ def prepareCore(coin, version, settings, data_dir):
         signing_key_name = 'tecnovert'
         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_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':
         signing_key_name = 'thrasher'
         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_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':
         signing_key_name = 'laanwj'
         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_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':
         signing_key_name = 'JeremyRand'
         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_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:
         raise ValueError('Unknown coin')
 
diff --git a/doc/install.md b/doc/install.md
index 91f31ed..c735321 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -37,8 +37,8 @@ Before running docker-compose build
 ## Install as Python Module with PIP
 
     $ cd basicswap
-    $ pip3 install .
     $ protoc -I=basicswap --python_out=basicswap basicswap/messages.proto
+    $ pip3 install .
     $ basicswap-prepare
     $ basicswap-run
 
diff --git a/tests/basicswap/__init__.py b/tests/basicswap/__init__.py
index bbdd140..0c173cf 100644
--- a/tests/basicswap/__init__.py
+++ b/tests/basicswap/__init__.py
@@ -3,6 +3,7 @@ import unittest
 import tests.basicswap.test_other as test_other
 import tests.basicswap.test_prepare as test_prepare
 import tests.basicswap.test_run as test_run
+import tests.basicswap.test_reload as test_reload
 
 
 def test_suite():
@@ -10,5 +11,6 @@ def test_suite():
     suite = loader.loadTestsFromModule(test_other)
     suite.addTests(loader.loadTestsFromModule(test_prepare))
     suite.addTests(loader.loadTestsFromModule(test_run))
+    suite.addTests(loader.loadTestsFromModule(test_reload))
 
     return suite