Added contrib dir.

.cirrus.yml

@@ -6,8 +6,8 @@ lint_task:
     - pip install flake8
     - pip install codespell
   script:
-    - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=segwit_addr.py,key.py,messages_pb2.py,.eggs
-    - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,gitianpubkeys,*.pyc,*mnemonics.py
+    - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=basicswap/contrib,messages_pb2.py,.eggs
+    - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,gitianpubkeys,*.pyc,*mnemonics.py,basicswap/contrib
 
 test_task:
   environment:

.travis.yml

@@ -47,8 +47,8 @@ jobs:
         - travis_retry pip install codespell==1.15.0
       before_script:
       script:
-        - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=segwit_addr.py,key.py,messages_pb2.py,.eggs
-        - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,gitianpubkeys,*.pyc
+        - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=basicswap/contrib,messages_pb2.py,.eggs
+        - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,gitianpubkeys,*.pyc,basicswap/contrib
       after_success:
         - echo "End lint"
     - stage: test

basicswap/base.py

@@ -10,7 +10,7 @@ import logging
 import subprocess
 
 import basicswap.config as cfg
-import basicswap.segwit_addr as segwit_addr
+import basicswap.contrib.segwit_addr as segwit_addr
 
 from .chainparams import (
     chainparams,

basicswap/util.py

@@ -7,7 +7,7 @@
 import decimal
 import json
 import hashlib
-from .segwit_addr import bech32_decode, convertbits, bech32_encode
+from .contrib.segwit_addr import bech32_decode, convertbits, bech32_encode
 
 COIN = 100000000
 DCOIN = decimal.Decimal(COIN)

tests/basicswap/test_nmc.py

@@ -38,7 +38,7 @@ from basicswap.rpc import (
     callrpc_cli,
     waitForRPC,
 )
-from basicswap.key import (
+from basicswap.contrib.key import (
     ECKey,
 )
 from basicswap.http_server import (

tests/basicswap/test_run.py

@@ -42,7 +42,7 @@ from basicswap.rpc import (
     callrpc_cli,
     waitForRPC,
 )
-from basicswap.key import (
+from basicswap.contrib.key import (
     ECKey,
 )
 from basicswap.http_server import (
@@ -87,6 +87,7 @@ def prepareOtherDir(datadir, nodeId, conf_file='litecoin.conf'):
         fp.write('findpeers=0\n')
         fp.write('debug=1\n')
         fp.write('debugexclude=libevent\n')
+        fp.write('fallbackfee=0.0002\n')
 
         fp.write('acceptnonstdtxn=0\n')