transform preferences into python dict

test.py

@@ -13,26 +13,43 @@ market = state.abi_contract('contracts/market.se', gas=10000000)
 # Create Match Maker
 class Matchmaker:
 
-    def new_block(self, block):
-        print('new block', block)
+    def process(self):
+        # TODO:
+        # make matches
+        # add sealed offers
+        # reveal offers
+        # do cleanup
+        # print('reveal', market.add_sealed_offer(0, 1))
+        print('processing on block', self.current_block)
 
     def announce(self, data):
         ''' A new ticket has arrived '''
         ticket = data[0]
         info = market.get_info(ticket)
+
+        # Rebuild Preferences
         preferences = market.get_preferences(ticket)
+        keys = [utils.encode_int(x) for x in preferences[::2]]
+        preferences = dict(zip(keys, preferences[1::2]))
+        del preferences['']
+
         print('ticket #', ticket)
-        print('ticket info', info)
+        print('ticket info', info)  # owner, epoch, state
         print('ticket preferences', preferences)
 
+        self.process()
+
     def listener(self, msg):
         '''
         Dynamically call Methods based on first param
         Currently only announce exists
 
-        Also iterates on blocks
+        Also calls process on new block number, based on delta event
         '''
         event = msg['event']
+        # if event != 'LOG' and event != 'vm':
+        #     print(event)
+
         if event == 'LOG' and msg['to'] == self.market:
             msg_type = utils.encode_int(msg['topics'][0]).rstrip('\x00')
             msg_data = msg['topics'][1:]
@@ -43,7 +60,7 @@ class Matchmaker:
         elif event == 'delta':
             if self.current_block < state.block.number:
                 self.current_block = state.block.number
-                self.new_block(state.block.number)
+                self.process()
 
     def __init__(self, market):
         self.market = market
@@ -54,8 +71,6 @@ class Matchmaker:
 market_addr = '\xc3\x05\xc9\x01\x07\x87\x81\xc22\xa2\xa5!\xc2\xafy\x80\xf88^\xe9'
 match_maker = Matchmaker(market_addr)
 
-state.mine(n=1)
-
 # Create buy ticket, add preferences, activate
 buy_ticket = market.add()
 market.add_preference(buy_ticket, 'head', 10)
@@ -68,4 +83,15 @@ sell_ticket = market.add()
 market.add_preference(sell_ticket, 'price', -5)
 market.activate(sell_ticket)
 
-# print('reveal', market.add_sealed_offer(0, 1))
+# Move into Sealed Window
+print('sealed window')
+state.mine(n=1)
+
+# Move into Reveal Window
+print('reveal window')
+state.mine(n=2)
+
+print('accept window')
+# Move into Accept Window
+state.mine(n=1)
+print('fin')