From d0b1c1d9b0a0e5546bd9b0d9ba6445ebfba7c42f Mon Sep 17 00:00:00 2001
From: Mark Spanbroek <mark@spanbroek.net>
Date: Thu, 2 Dec 2021 11:21:06 +0100
Subject: [PATCH] Reorder decoding funcs

Now all decode overloads are in one place
---
 contractabi/decoding.nim | 46 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/contractabi/decoding.nim b/contractabi/decoding.nim
index 0219737..09c8d55 100644
--- a/contractabi/decoding.nim
+++ b/contractabi/decoding.nim
@@ -37,6 +37,15 @@ func index(decoder: var AbiDecoder): var int =
 func `index=`(decoder: var AbiDecoder, value: int) =
   decoder.currentTuple.index = value
 
+func startTuple(decoder: var AbiDecoder): ?!void =
+  decoder.stack.add(Tuple.init(decoder.index))
+  success()
+
+func finishTuple(decoder: var AbiDecoder) =
+  doAssert decoder.stack.len > 1, "unable to finish a tuple that hasn't started"
+  let tupl = decoder.stack.pop()
+  decoder.index = tupl.index
+
 func updateLast(decoder: var AbiDecoder, index: int) =
   if index > decoder.last:
     decoder.last = index
@@ -108,15 +117,6 @@ func decode(decoder: var AbiDecoder, T: type seq[byte]): ?!T =
   let len = ?decoder.read(uint64)
   decoder.read(len.int, padRight)
 
-func startTuple(decoder: var AbiDecoder): ?!void =
-  decoder.stack.add(Tuple.init(decoder.index))
-  success()
-
-func finishTuple(decoder: var AbiDecoder) =
-  doAssert decoder.stack.len > 1, "unable to finish a tuple that hasn't started"
-  let tupl = decoder.stack.pop()
-  decoder.index = tupl.index
-
 func decode[T: tuple](decoder: var AbiDecoder, _: typedesc[T]): ?!T =
   var tupl: T
   ?decoder.startTuple()
@@ -125,14 +125,6 @@ func decode[T: tuple](decoder: var AbiDecoder, _: typedesc[T]): ?!T =
   decoder.finishTuple()
   success tupl
 
-func finish(decoder: var AbiDecoder): ?!void =
-  doAssert decoder.stack.len == 1, "not all tuples were finished"
-  doAssert decoder.last mod 32 == 0, "encoding invariant broken"
-  if decoder.last != decoder.bytes.len:
-    failure "unread trailing bytes found"
-  else:
-    success()
-
 func decode[T](decoder: var AbiDecoder, _: type seq[T]): ?!seq[T] =
   var sequence: seq[T]
   let len = ?decoder.read(uint64)
@@ -153,12 +145,6 @@ func decode[I,T](decoder: var AbiDecoder, _: type array[I,T]): ?!array[I,T] =
 func decode(decoder: var AbiDecoder, T: type string): ?!T =
   success string.fromBytes(?decoder.read(seq[byte]))
 
-func decode*(_: type AbiDecoder, bytes: seq[byte], T: type): ?!T =
-  var decoder = AbiDecoder.init(bytes)
-  var value = ?decoder.decode(T)
-  ?decoder.finish()
-  success value
-
 func readOffset(decoder: var AbiDecoder): ?!int =
   let offset = ?decoder.read(uint64)
   success decoder.currentTuple.start + offset.int
@@ -175,3 +161,17 @@ func read*(decoder: var AbiDecoder, T: type): ?!T =
     decoder.readTail(T)
   else:
     decoder.decode(T)
+
+func finish(decoder: var AbiDecoder): ?!void =
+  doAssert decoder.stack.len == 1, "not all tuples were finished"
+  doAssert decoder.last mod 32 == 0, "encoding invariant broken"
+  if decoder.last != decoder.bytes.len:
+    failure "unread trailing bytes found"
+  else:
+    success()
+
+func decode*(_: type AbiDecoder, bytes: seq[byte], T: type): ?!T =
+  var decoder = AbiDecoder.init(bytes)
+  var value = ?decoder.decode(T)
+  ?decoder.finish()
+  success value