makify now ensures correct ordering of all fields

Author: SmithSamuelM

src/keri/core/serdering.py

@@ -780,9 +780,15 @@ def makify(self, sad, *, version=None,
                     value = copy.copy(value)  # copy iterable defaults
                 sad[label] = value
 
-        # Need to insert required fields in proper place because passed in sad
-        # may have missing require fields that appear before provided ones so
-        # can't simply append
+        sadold = sad
+        sad = {}
+        for label in oalls:  # make sure all fields are in correct order
+            if label in sadold:
+                sad[label] = sadold[label]
+
+        for label in sadold:  # copy extras if any
+            if label not in sad:
+                sad[label] = sadold[label]
 
         if 't' in sad:  # when packet type field then force ilk
             sad['t'] = ilk  # assign ilk

tests/core/test_serdering.py

@@ -606,13 +606,10 @@ def test_serder():
     sad = serder.sad
     sad["ri"] = ""
 
-    with pytest.raises(kering.SerializeError):
-        serder = Serder(makify=True, sad=sad)  # make using sad
-
+    serder = Serder(makify=True, sad=sad)  # make using sad fixes order
 
     # extra field with strict
     sad = serder.sad
-    assert 'ri' not in sad
     sad["x"] = ""
 
     with pytest.raises(kering.SerializeError):
@@ -659,8 +656,7 @@ def test_serder():
     # out of order with extra
     sad = serder.sad
     sad["ri"] = ""
-    with pytest.raises(kering.SerializeError):
-        serder = Serder(makify=True, sad=sad)  # make using sad
+    serder = Serder(makify=True, sad=sad)  # makify fixes order with extra
 
     # ToDo: create malicious raw values to test verify more thoroughly
     # ToDo: create bad sad values to test makify more thoroughly
@@ -1313,6 +1309,7 @@ def test_serderkeri_dip():
     assert serder.verify()
 
     raw = serder.raw
+    sad = serder.sad
     said = serder.said
     size = serder.size
     ilk = serder.ilk