From 1d8147e14f1944bfd5f2c74e7723a10bd6dbe6f7 Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 24 Mar 2024 15:39:40 -0400 Subject: [PATCH] runner event handling fixes --- src/dexorder/progressor.py | 8 +++++++- src/dexorder/util/json.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/dexorder/progressor.py b/src/dexorder/progressor.py index 08637de..b6c4617 100644 --- a/src/dexorder/progressor.py +++ b/src/dexorder/progressor.py @@ -43,7 +43,13 @@ class BlockProgressor(metaclass=ABCMeta): """ if log_filter is None and event is not None: log_filter = {'topics': [topic(event.abi)]} - cb = callback if event is None or multi else functools.partial(map, callback) + if multi or event is None: + cb = callback + else: + async def _map(func, events): + for e in events: + await maywait(func(e)) + cb = callback if event is None or multi else functools.partial(_map, callback) self.events.append((cb, event, log_filter)) @abstractmethod diff --git a/src/dexorder/util/json.py b/src/dexorder/util/json.py index efa709b..3f65a71 100644 --- a/src/dexorder/util/json.py +++ b/src/dexorder/util/json.py @@ -38,7 +38,7 @@ def dumps(obj): return dumpb(obj).decode('utf8') def dumpb(obj): - opts = orjson.OPT_PASSTHROUGH_SUBCLASS | orjson.OPT_STRICT_INTEGER + opts = orjson.OPT_PASSTHROUGH_SUBCLASS return orjson.dumps(obj, default=_serialize, option=opts)