Browse Source

tx.new, tw.addresses: cleanups, minor fix

The MMGen Project 2 years ago
parent
commit
5e08f8c964
2 changed files with 4 additions and 3 deletions
  1. 4 1
      mmgen/tw/addresses.py
  2. 0 2
      mmgen/tx/new.py

+ 4 - 1
mmgen/tw/addresses.py

@@ -269,6 +269,7 @@ class TwAddresses(TwView):
 				yield (sid_save, sid_range(bot, n-1))
 				yield (sid_save, sid_range(bot, n-1))
 
 
 		assert self.sort_key == 'twmmid'
 		assert self.sort_key == 'twmmid'
+		assert self.reverse == False
 
 
 		if not hasattr(self,'_sid_ranges'):
 		if not hasattr(self,'_sid_ranges'):
 			self._sid_ranges = dict(gen_sid_ranges())
 			self._sid_ranges = dict(gen_sid_ranges())
@@ -313,6 +314,7 @@ class TwAddresses(TwView):
 				n = (top + bot) >> 1
 				n = (top + bot) >> 1
 
 
 		assert self.sort_key == 'twmmid'
 		assert self.sort_key == 'twmmid'
+		assert self.reverse == False
 
 
 		data = self.data
 		data = self.data
 		start = get_start(
 		start = get_start(
@@ -325,7 +327,8 @@ class TwAddresses(TwView):
 					if not d.recvd:
 					if not d.recvd:
 						return d
 						return d
 				else:
 				else:
-					return False
+					break
+			return False
 
 
 	def get_change_address_by_addrtype(self,mmtype):
 	def get_change_address_by_addrtype(self,mmtype):
 		"""
 		"""

+ 0 - 2
mmgen/tx/new.py

@@ -189,8 +189,6 @@ class New(Base):
 
 
 			from ..tw.addresses import TwAddresses
 			from ..tw.addresses import TwAddresses
 			al = await TwAddresses(self.proto,get_data=True)
 			al = await TwAddresses(self.proto,get_data=True)
-			al.reverse = False
-			al.do_sort('twmmid')
 
 
 			if is_mmgen_addrtype(self.proto,arg):
 			if is_mmgen_addrtype(self.proto,arg):
 				arg = MMGenAddrType(self.proto,arg)
 				arg = MMGenAddrType(self.proto,arg)