From c1c5c5d18a65b88bb9dc71e3eb063e6235c6fdc0 Mon Sep 17 00:00:00 2001
From: Anton Grigoryev <mail@griganton.ru>
Date: Thu, 12 Mar 2015 01:52:26 +0300
Subject: [PATCH] testing.py works

please test it :)
---
 mtproto.py | 54 +++++++++++++++++++++++++++---------------------------
 testing.py | 21 +++++++--------------
 2 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/mtproto.py b/mtproto.py
index 7584062c..468339b5 100644
--- a/mtproto.py
+++ b/mtproto.py
@@ -24,36 +24,38 @@ def vis(bs):
     print(" ".join(["%02X" % b for b in bs[(i+1)*symbols_in_one_line:]])+"\n") # for last line
 
 
+class TlConstructor:
+    def __init__(self, json_dict):
+        self.id = int(json_dict['id'])
+        self.type = json_dict['type']
+        self.predicate = json_dict['predicate']
+        self.params = []
+        # case of vector
+        for param in json_dict['params']:
+            if param['type'] == "Vector<long>":
+                param['type'] = "Vector t"
+                param['subtype'] = "long"
+            else:
+                param['subtype'] = None
+            self.params.append(param)
+
+
 class TL:
     def __init__(self):
         with open("TL_schema.JSON", 'r') as f:
-            TL_dict = json.load(f)
+           TL_dict = json.load(f)
 
-        self.methods = TL_dict['methods']
         self.constructors = TL_dict['constructors']
-
-        self.func_dict_id = {}
-        self.func_dict_name = {}
-        self.obj_dict_id = {}
-        self.obj_dict_name = {}
+        self.constructor_id = {}
+        self.constructor_type = {}
 
         # Read constructors
 
         for elem in self.constructors:
-            z = TlElement(elem)
-            self.func_dict_id = {}
+            z = TlConstructor(elem)
+            self.constructor_id[z.id] = z
+            self.constructor_type[z.type] = z
 
-    def serialize(self, type_, data):
-        # 1. Type constructor ID
-        # 2. type costructor params
-
-        # Bare types
-        if type_ == 'string':
-            assert isinstance(data, str)
-            struct.pack("<L", len(data))
-        if type_ == 'int':
-            assert isinstance(data, str)
-            struct.pack("<L", len(data))
 
     def deserialize(self, byte_string, type_=None, subtype=None):
 
@@ -103,19 +105,17 @@ class TL:
             x = [self.deserialize(bytes_io, type_=subtype) for i in range(count)]
         else:
             # Boxed types
-
             i = struct.unpack('<i', bytes_io.read(4))[0]  # read type ID
             try:
-                tl_elem = self.obj_dict_id[i]
+                tl_elem = self.constructor_id[i]
             except:
                 raise Exception("Could not extract type: %s" % type_)
-            base_boxed_types = ["Vector", "Int", "Long", "Double", "String", "Int128", "Int256"]
-            if tl_elem.result in base_boxed_types:
-                x = self.deserialize(bytes_io, type_=tl_elem.name, subtype=subtype)
-
+            base_boxed_types = ["Vector t", "Int", "Long", "Double", "String", "Int128", "Int256"]
+            if tl_elem.type in base_boxed_types:
+                x = self.deserialize(bytes_io, type_=tl_elem.predicate, subtype=subtype)
             else:  # other types
                 x = {}
-                for arg in tl_elem.args:
+                for arg in tl_elem.params:
                     x[arg['name']] = self.deserialize(bytes_io, type_=arg['type'], subtype=arg['subtype'])
         return x
 
diff --git a/testing.py b/testing.py
index 1a80ed96..ef8088a8 100644
--- a/testing.py
+++ b/testing.py
@@ -1,24 +1,17 @@
 # -*- coding: utf-8 -*-
-"""
-Created on Mon Sep  1 16:24:47 2014
-
-@author: agrigoryev
-
-"""
-
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import socket
 import mtproto
 import os
-import time
-import math
 import prime
 import io
+import configparser
+
+config = configparser.ConfigParser()
+config.read('credentials')
+ip = config['App data']['ip_address']
+port = config['App data'].getint('port')
 
 
-Session = mtproto.Session('credentials')
+Session = mtproto.Session(ip, port)
 nonce = os.urandom(16)
 tosend = b'\x78\x97\x46\x60' + nonce
 Session.send_message(tosend)