disconnect-block now uses one write batch

amiller · amiller · commit c1d6a203630b · 2012-10-01T01:24:42.000-04:00
Signed-off-by: Andrew Miller &lt;amiller@dappervision.com&gt;
diff --git a/ChainDb.py b/ChainDb.py
@@ -212,13 +212,13 @@ def spend_txout(self, txhash, n_idx, batch=None):
 
 		return True
 
-	def clear_txout(self, txhash, n_idx):
+	def clear_txout(self, txhash, n_idx, batch=None):
 		txidx = self.gettxidx(txhash)
 		if txidx is None:
 			return False
 
 		txidx.spentmask &= ~(1L << n_idx)
-		self.puttxidx(txhash, txidx)
+		self.puttxidx(txhash, txidx, batch)
 
 		return True
 
@@ -401,11 +401,11 @@ def disconnect_block(self, block):
 		outpts = tup[0]
 
 		# mark deps as unspent
+		batch = leveldb.WriteBatch()
 		for outpt in outpts:
-			self.clear_txout(outpt[0], outpt[1])
+			self.clear_txout(outpt[0], outpt[1], batch)
 
 		# update tx index and memory pool
-		batch = leveldb.WriteBatch()
 		for tx in block.vtx:
 			tx.calc_sha256()
 			ser_hash = ser_uint256(tx.sha256)
