Merge pull request #1296 from romanz/master

Fix few small issues.
This commit is contained in:
ThomasV 2015-06-13 16:38:52 +02:00
commit 99c50aa31f
3 changed files with 6 additions and 2 deletions

View File

@ -24,6 +24,7 @@ import bitcoin
from bitcoin import *
from util import print_error
import time
import sys
import struct
#

View File

@ -45,7 +45,10 @@ class DaemonThread(threading.Thread):
self.running = False
def print_error(self, *msg):
print_error("[%s]"%self.__class__.__name__, *msg)
print_error("[%s]" % self.__class__.__name__, *msg)
def print_msg(self, *msg):
print_msg("[%s]" % self.__class__.__name__, *msg)

View File

@ -92,7 +92,7 @@ class SPV(util.DaemonThread):
def undo_verifications(self, height):
tx_hashes = selt.wallet.undo_verifications(height)
tx_hashes = self.wallet.undo_verifications(height)
for tx_hash in tx_hashes:
self.print_error("redoing", tx_hash)
self.merkle_roots.pop(tx_hash, None)