Change order of oid/serial fields in CheckCurrentSerial packet

neo/client/app.py

@@ -874,7 +874,7 @@ class Application(ThreadedApplication):
         # after stores, and skips oids that have been successfully stored.
         assert oid not in txn_context.cache_dict, oid
         assert oid not in txn_context.data_dict, oid
-        packet = Packets.AskCheckCurrentSerial(ttid, serial, oid)
+        packet = Packets.AskCheckCurrentSerial(ttid, oid, serial)
         txn_context.data_dict[oid] = CHECKED_SERIAL, txn_context.write(
             self, packet, oid, 0, oid=oid, serial=serial)
         self._waitAnyTransactionMessage(txn_context, False)

neo/lib/protocol.py

@@ -1259,8 +1259,8 @@ class CheckCurrentSerial(Packet):
     """
     _fmt = PStruct('ask_check_current_serial',
         PTID('tid'),
-        PTID('serial'),
         POID('oid'),
+        PTID('serial'),
     )
 
     _answer = StoreObject._answer

neo/storage/handlers/client.py

@@ -162,20 +162,20 @@ class ClientOperationHandler(EventHandler):
             p = Packets.AnswerObjectHistory(oid, history_list)
         conn.answer(p)
 
-    def askCheckCurrentSerial(self, conn, ttid, serial, oid):
+    def askCheckCurrentSerial(self, conn, ttid, oid, serial):
         self.app.tm.register(conn, ttid)
-        self._askCheckCurrentSerial(conn, ttid, serial, oid, time.time())
+        self._askCheckCurrentSerial(conn, ttid, oid, serial, time.time())
 
-    def _askCheckCurrentSerial(self, conn, ttid, serial, oid, request_time):
+    def _askCheckCurrentSerial(self, conn, ttid, oid, serial, request_time):
         try:
-            self.app.tm.checkCurrentSerial(ttid, serial, oid)
+            self.app.tm.checkCurrentSerial(ttid, oid, serial)
         except ConflictError, err:
             # resolvable or not
             conn.answer(Packets.AnswerCheckCurrentSerial(err.tid))
         except DelayedError:
             # locked by a previous transaction, retry later
             self.app.tm.queueEvent(self._askCheckCurrentSerial, conn,
-                (ttid, serial, oid, request_time))
+                (ttid, oid, serial, request_time))
         except NotRegisteredError:
             # transaction was aborted, cancel this event
             logging.info('Forget serial check of %s:%s by %s delayed by %s',

neo/storage/transactions.py

@@ -291,7 +291,7 @@ class TransactionManager(EventQueue):
         logging.debug('Transaction %s storing %s', dump(ttid), dump(oid))
         self._store_lock_dict[oid] = ttid
 
-    def checkCurrentSerial(self, ttid, serial, oid):
+    def checkCurrentSerial(self, ttid, oid, serial):
         try:
             transaction = self._transaction_dict[ttid]
         except KeyError: