Leftover change from clearing ProtoV2 code: increment settings version from 7 to 8
This commit is contained in:
parent
607acf74f5
commit
3ef83c2f95
|
@ -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.
|
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
|
initialDecryptionSuccessful = True
|
||||||
logger.info('EC decryption successful using key associated with ripe hash: %s.' % key.encode('hex'))
|
logger.info('EC decryption successful using key associated with ripe hash: %s.' % key.encode('hex'))
|
||||||
#msgObjectContainedVersion = False
|
|
||||||
break
|
break
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
pass
|
pass
|
||||||
|
@ -768,13 +767,11 @@ class objectProcessor(threading.Thread):
|
||||||
logger.info('Time spent processing this interesting broadcast: %s' % (time.time() - messageProcessingStartTime,))
|
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):
|
def possibleNewPubkey(self, ripe=None, address=None):
|
||||||
"""
|
"""
|
||||||
We have put a new pubkey in our pubkeys table. Let's see if we have been
|
We have inserted a pubkey into our pubkey table which we received from a
|
||||||
awaiting it.
|
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
|
# For address versions <= 3, we wait on a key with the correct ripe hash
|
||||||
if ripe != None:
|
if ripe != None:
|
||||||
|
|
|
@ -61,7 +61,7 @@ class sqlThread(threading.Thread):
|
||||||
'''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''')
|
'''INSERT INTO subscriptions VALUES('Bitmessage new releases/announcements','BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw',1)''')
|
||||||
self.cur.execute(
|
self.cur.execute(
|
||||||
'''CREATE TABLE settings (key blob, value blob, UNIQUE(key) ON CONFLICT REPLACE)''' )
|
'''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',?)''', (
|
self.cur.execute( '''INSERT INTO settings VALUES('lastvacuumtime',?)''', (
|
||||||
int(time.time()),))
|
int(time.time()),))
|
||||||
self.cur.execute(
|
self.cur.execute(
|
||||||
|
|
Loading…
Reference in New Issue
Block a user