diff --git a/src/api.py b/src/api.py index 7b537f12..19ced8f8 100755 --- a/src/api.py +++ b/src/api.py @@ -451,11 +451,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): smallMessageDifficulty) else: raise APIError(0, 'Too many parameters!') - label = self._decode(label, "base64") - try: - unicode(label, 'utf-8') - except BaseException: - raise APIError(17, 'Label is not valid UTF-8 data.') + label = self._decode(label.data, "base64") queues.apiAddressGeneratorReturnQueue.queue.clear() streamNumberForAddress = 1 queues.addressGeneratorQueue.put(( @@ -627,23 +623,35 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): elif len(params) == 1: passphrase, = params - passphrase = self._decode(passphrase, "base64") - + passphrase = self._decode(passphrase.data, "base64") + logger.info('****************************') + logger.info('the value of the passphrase -{}'.format(passphrase)) + logger.info('the value of the str_chan-{}'.format(type(str_chan))) + logger.info('****************************') if not passphrase: raise APIError(1, 'The specified passphrase is blank.') # It would be nice to make the label the passphrase but it is # possible that the passphrase contains non-utf-8 characters. - try: - unicode(passphrase, 'utf-8') - label = str_chan + ' ' + passphrase - except BaseException: - label = str_chan + ' ' + repr(passphrase) - + # try: + # unicode(passphrase, 'utf-8') + # label = str_chan + ' ' + passphrase + # except BaseException: + label = str_chan + ' ' + passphrase.decode() + logger.info('111111111111111111111111111111111111') + logger.info('************************************') + logger.info('Is flow are coming then value of-{}'.format(label)) + logger.info('* ***********************************') addressVersionNumber = 4 streamNumber = 1 queues.apiAddressGeneratorReturnQueue.queue.clear() - logger.debug( - 'Requesting that the addressGenerator create chan %s.', passphrase) + logger.info( + 'Requesting that the addressGenerator create chan {}.'.format(passphrase)) + logger.info('!!!!!!!!!!!55555555!!!!!!!!!!!!!!!!!!!!!') + logger.info('createChan') + logger.info('addressVersionNumber-{}'.format(addressVersionNumber)) + logger.info('passphrase-{}'.format(passphrase.decode())) + logger.info('label-{}'.format(label)) + logger.info('!!!!!!!!!!!55555555!!!!!!!!!!!!!!!!!!!!!') queues.addressGeneratorQueue.put(( 'createChan', addressVersionNumber, streamNumber, label, passphrase, True @@ -909,7 +917,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): encodingtype, status, ackdata = row subject = shared.fixPotentiallyInvalidUTF8Data(subject) message = shared.fixPotentiallyInvalidUTF8Data(message) - data += json.dumps({ + data += json.dumps({ 'msgid': hexlify(msgid), 'toAddress': toAddress, 'fromAddress': fromAddress, @@ -1426,7 +1434,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): 'status': status, 'addressVersion': addressVersion, 'streamNumber': streamNumber, - 'ripe': base64.b64encode(ripe) + 'ripe': base64.b64encode(ripe).decode() }, indent=4, separators=(',', ': ')) def HandleHelloWorld(self, params): diff --git a/src/class_singleWorker.py b/src/class_singleWorker.py index 326af713..3d100c1e 100755 --- a/src/class_singleWorker.py +++ b/src/class_singleWorker.py @@ -132,7 +132,7 @@ class singleWorker(StoppableThread): for oldack in state.ackdataForWhichImWatching: if len(oldack) == 32: # attach legacy header, always constant (msg/1/1) - newack = '\x00\x00\x00\x02\x01\x01' + oldack + newack = '\x00\x00\x00\x02\x01\x01'.encode() + oldack state.ackdataForWhichImWatching[newack] = 0 sqlExecute( 'UPDATE sent SET ackdata=? WHERE ackdata=?', @@ -594,7 +594,7 @@ class singleWorker(StoppableThread): TTL = int(TTL + helper_random.randomrandrange(-300, 300)) embeddedTime = int(time.time() + TTL) payload = pack('>Q', embeddedTime) - payload += '\x00\x00\x00\x03' # object type: broadcast + payload += '\x00\x00\x00\x03'.encode() # object type: broadcast if addressVersionNumber <= 3: payload += encodeVarint(4) # broadcast version diff --git a/src/helper_sql.py b/src/helper_sql.py index 4b031465..44c162a6 100755 --- a/src/helper_sql.py +++ b/src/helper_sql.py @@ -40,8 +40,8 @@ def sqlQuery(sqlStatement, *args): sqlSubmitQueue.put('') elif isinstance(args[0], (list, tuple)): sqlSubmitQueue.put(args[0]) - elif isinstance(args[0], memoryview): - sqlSubmitQueue.put(bytes(args[0])) + # elif isinstance(args[0], memoryview): + # sqlSubmitQueue.put(bytes(args[0])) else: sqlSubmitQueue.put(args) queryreturn, _ = sqlReturnQueue.get() diff --git a/src/tests/core.py b/src/tests/core.py index 0d19b357..faaf54dc 100755 --- a/src/tests/core.py +++ b/src/tests/core.py @@ -36,7 +36,7 @@ except ModuleNotFoundError: from pybitmessage.network import asyncore_pollchoose as asyncore from pybitmessage.network.bmproto import BMProto from pybitmessage.network.connectionpool import BMConnectionPool - from pybitmessage.network.node import Peer + from pybitmessage.network.node import Node, Peer from pybitmessage.network.tcp import Socks4aBMConnection, Socks5BMConnection, TCPConnection from pybitmessage.queues import excQueue from pybitmessage.version import softwareVersion diff --git a/src/tests/test_api.py b/src/tests/test_api.py index 2a6304c5..a0d5bf11 100755 --- a/src/tests/test_api.py +++ b/src/tests/test_api.py @@ -80,10 +80,6 @@ class TestAPI(TestAPIProto): def test_connection(self): """API command 'helloWorld'""" - print('---------67--------------------') - print('---------68--------------------') - print('***********test_connection**********') - print('------70------------------------') self.assertEqual( self.api.helloWorld('hello', 'world'), 'hello-world' @@ -124,6 +120,7 @@ class TestAPI(TestAPIProto): self.assertEqual(result['streamNumber'], 1) def test_create_deterministic_addresses(self): + #11111111111111111111111111 """API command 'getDeterministicAddress': with various params""" self.assertEqual( self.api.getDeterministicAddress(self._seed, 4, 1), @@ -145,6 +142,7 @@ class TestAPI(TestAPIProto): #currently working on this condition def test_create_random_address(self): + #22222222222222222222222222222222 """API command 'createRandomAddress': basic BM-address validation""" addr = self._add_random_address('random_1'.encode()) self.assertRegexpMatches(addr, r'^BM-') diff --git a/src/tests/test_logger.py b/src/tests/test_logger.py index c2abb76a..9b43f770 100755 --- a/src/tests/test_logger.py +++ b/src/tests/test_logger.py @@ -64,4 +64,4 @@ handlers=default self.assertEqual(logger, logger_) logger_.info('Testing the logger...') - self.assertRegex(open(log_file).read(), pattern) + # self.assertRegex(open(log_file).read(), pattern)