Justin qp test

.gitignore

@@ -0,0 +1,5 @@
+.idea/
+build
+*.egg
+*.xml
+.idea/workspace.xml

configure

@@ -93,22 +93,21 @@ fi
 chown $user $logfile
 
 
-unetd_user=$(read_config "unetd_user")
-if ! [ "$unetd_user" ]; then
-    read -p "rpcuser (from your unet.conf file): " -r
-    write_config "unetd_user" $REPLY
+unetd_user=$(read_config "ulordd_user")
+if ! [ "$ulordd_user" ]; then
+    read -p "rpcuser (from your ulord.conf file): " -r
+    write_config "ulordd_user" $REPLY
 fi
 
-unetd_password=$(read_config "unetd_password")
-if ! [ "$unetd_password" ]; then
-    read -p "rpcpassword (from your unet.conf file): " -r
-    write_config "unetd_password" $REPLY
+unetd_password=$(read_config "ulordd_password")
+if ! [ "$ulordd_password" ]; then
+    read -p "rpcpassword (from your ulord.conf file): " -r
+    write_config "ulordd_password" $REPLY
 fi
 
 
 # finish
 echo "Configuration written to $uwallet_config."
 echo "Please edit this file to finish the configuration."
 echo "If you have not done so, please run 'python setup.py install'"
->>>>>>> 217104beed8b7501cc1455fe18da345c0f7b25a7
-echo "Then, run 'uwallet-server' to start the daemon"
+echo "Then, run 'uwallet-server' to start the daemon"

setup.py

@@ -5,14 +5,14 @@
 
 import shutil
 import platform
-current_place = get_python_lib()
+#current_place = get_python_lib()
 
-if platform.system().startswith('Win'):
-    shutil.copyfile(os.path.join('uwalletserver', 'cryptohello_hash.pyd'),
-                    os.path.join(current_place, 'cryptohello_hash.pyd'))
-else:
-    shutil.copyfile(os.path.join('uwalletserver', 'cryptohello_hash.so'),
-                    os.path.join(current_place, 'cryptohello_hash.so'))
+#if platform.system().startswith('Win'):
+#    shutil.copyfile(os.path.join('uwalletserver', 'cryptohello_hash.pyd'),
+#                    os.path.join(current_place, 'cryptohello_hash.pyd'))
+#else:
+#    shutil.copyfile(os.path.join('uwalletserver', 'cryptohello_hash.so'),
+#                    os.path.join(current_place, 'cryptohello_hash.so'))
 
 
 requires = [
@@ -43,4 +43,4 @@
     license="GNU Affero GPLv3",
     long_description="""Server for the Electrum Lightweight UC Wallet"""
 )
-
+ 

tests/test_http.py

@@ -2,12 +2,6 @@
 #-*- coding:utf-8 -*-
 from urllib.request import urlretrieve
 
-def firstNonBlank(lines):
-    for  eachLine in lines:
-        if not eachLine.strip():
-            continue
-        else:
-            return eachLine
 
 def firstLast(webpage):
     f=open(webpage,encoding='utf-8')
@@ -26,4 +20,4 @@ def download(url='http://www.baidu.com',process=firstLast):
         process(retval)
 
 if __name__=="__main__":
-    download()
+    download()

uwallet.conf.sample

@@ -29,9 +29,9 @@ pruning_limit = 100
 #utxo_cache = 134217728
 #addr_cache = 16777216
 
-[unetd]
-unetd_host = localhost
-unetd_port = 9457
-# user and password from unet.conf
-unetd_user = lqp123456
-unetd_password = 
+[ulordd]
+ulordd_host = localhost
+ulordd_port = 
+# user and password from ulord.conf
+ulordd_user = 
+ulordd_password =