AaronFiore/electrum
1
0
Fork 0
Code Activity

import paymentrequests only when really needed

Browse Source
This commit is contained in:
ThomasV
2014-06-13 16:25:25 +02:00
parent 58c302a4cf
commit 36cee62849
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/paymentrequest.py
View File

@@ -49,13 +49,6 @@ import x509
REQUEST_HEADERS = {'Accept': 'application/bitcoin-paymentrequest', 'User-Agent': 'Electrum'}
ACK_HEADERS = {'Content-Type':'application/bitcoin-payment','Accept':'application/bitcoin-paymentack','User-Agent':'Electrum'}
# status can be:
PR_UNPAID = 0
PR_EXPIRED = 1
PR_SENT = 2 # sent but not propagated
PR_PAID = 3 # send and propagated
PR_ERROR = 4 # could not parse
ca_list = {}
ca_path = os.path.expanduser("~/.electrum/ca/ca-bundle.crt")
@@ -64,7 +57,6 @@ ca_path = os.path.expanduser("~/.electrum/ca/ca-bundle.crt")
def load_certificates():
try:
ca_f = open(ca_path, 'r')
except Exception:
@@ -84,7 +76,7 @@ def load_certificates():
try:
x.parse(c)
except Exception as e:
print "cannot parse cert:", e
util.print_error("cannot parse cert:", e)
ca_list[x.getFingerprint()] = x
ca_f.close()
util.print_error("%d certificates"%len(ca_list))