From 9cf1a177cc105d200ed214e80903c6c822905dcf Mon Sep 17 00:00:00 2001 From: Andika Wasisto Date: Wed, 12 Aug 2020 03:42:19 +0700 Subject: [PATCH] Support arbitrary length for the randbytes method --- quanttp/__main__.py | 6 ++---- quanttp/data/qng_wrapper.py | 14 +++++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/quanttp/__main__.py b/quanttp/__main__.py index bbf82d8..cbaf2ae 100644 --- a/quanttp/__main__.py +++ b/quanttp/__main__.py @@ -60,8 +60,6 @@ def api_randbytes(): length = int(request.args.get('length')) if length < 1: return Response('length must be greater than 0', status=400, content_type='text/plain') - elif length > 8192: - return Response('length must be less than or equal to 8192', status=400, content_type='text/plain') qng_wrapper.clear() return Response(qng_wrapper.randbytes(length), content_type='application/octet-stream') except ValueError as e: @@ -89,7 +87,7 @@ def handle_ws_message(message, websocket, subscribed): websocket.send(str(qng_wrapper.randnormal())) elif split_message[0] == 'RANDBYTES': length = int(split_message[1]) - if not 1 <= length <= 8192: + if length < 1: raise ValueError() qng_wrapper.clear() websocket.send(qng_wrapper.randbytes(length)) @@ -113,7 +111,7 @@ def handle_ws_message(message, websocket, subscribed): websocket.send(str(qng_wrapper.randnormal())) elif split_message[0] == 'SUBSCRIBEBYTES': chunk = int(split_message[1]) - if not 1 <= chunk <= 8192: + if chunk < 1: raise ValueError() qng_wrapper.clear() if not subscribed[0]: diff --git a/quanttp/data/qng_wrapper.py b/quanttp/data/qng_wrapper.py index d32633c..80710e5 100644 --- a/quanttp/data/qng_wrapper.py +++ b/quanttp/data/qng_wrapper.py @@ -49,10 +49,22 @@ class QngWrapper: def randbytes(self, length): try: - return bytes(self.qng.RandBytes(length)) + return self._randbytes_arbitrary_length(length) except: self.qng.Reset() + return self._randbytes_arbitrary_length(length) + + def _randbytes_arbitrary_length(self, length): + if length <= 8192: return bytes(self.qng.RandBytes(length)) + else: + data = bytearray() + for x in range(length // 8192): + data.extend(bytearray(self.qng.RandBytes(8192))) + bytes_needed = length % 8192 + if bytes_needed != 0: + data.extend(bytearray(self.qng.RandBytes(bytes_needed))) + return bytes(data) def clear(self): self.qng.Clear()