From 3ef83c2f95f67f5cea02aeb4d97c65c557dc9507 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Thu, 25 Dec 2014 19:23:16 -0500 Subject: [PATCH] Leftover change from clearing ProtoV2 code: increment settings version from 7 to 8 --- src/class_objectProcessor.py | 9 +++------ src/class_sqlThread.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/class_objectProcessor.py b/src/class_objectProcessor.py index 0400ae7b..7a126f4a 100644 --- a/src/class_objectProcessor.py +++ b/src/class_objectProcessor.py @@ -342,7 +342,6 @@ class objectProcessor(threading.Thread): toRipe = key # This is the RIPE hash of my pubkeys. We need this below to compare to the destination_ripe included in the encrypted data. initialDecryptionSuccessful = True logger.info('EC decryption successful using key associated with ripe hash: %s.' % key.encode('hex')) - #msgObjectContainedVersion = False break except Exception as err: pass @@ -768,13 +767,11 @@ class objectProcessor(threading.Thread): logger.info('Time spent processing this interesting broadcast: %s' % (time.time() - messageProcessingStartTime,)) - # We have inserted a pubkey into our pubkey table which we received from a - # pubkey, msg, or broadcast message. It might be one that we have been - # waiting for. Let's check. def possibleNewPubkey(self, ripe=None, address=None): """ - We have put a new pubkey in our pubkeys table. Let's see if we have been - awaiting it. + We have inserted a pubkey into our pubkey table which we received from a + pubkey, msg, or broadcast message. It might be one that we have been + waiting for. Let's check. """ # For address versions <= 3, we wait on a key with the correct ripe hash if ripe != None: diff --git a/src/class_sqlThread.py b/src/class_sqlThread.py index ce4f837d..24e9b59a 100644 --- a/src/class_sqlThread.py +++ b/src/class_sqlThread.py @@ -61,7 +61,7 @@ class sqlThread(threading.Thread): '''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''') self.cur.execute( '''CREATE TABLE settings (key blob, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' ) - self.cur.execute( '''INSERT INTO settings VALUES('version','7')''') + self.cur.execute( '''INSERT INTO settings VALUES('version','8')''') self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', ( int(time.time()),)) self.cur.execute(