fixup! wip: serialize to/from list when downloading bundles from the chain

Author: JamesPiechota

src/ar_bundles.erl

@@ -147,7 +147,7 @@ data_item_signature_data(RawItem, signed) ->
     true = enforce_valid_tx(RawItem),
     ?event({data_item_signature_data, hb_util:human_id(RawItem#tx.unsigned_id)}),
     NormItem = normalize_data(RawItem, true),
-    ?event(debug_test, {data_item_signature_data, {explicit, NormItem}}),
+    ?event({data_item_signature_data, {explicit, NormItem}}),
     ar_deep_hash:hash([
         utf8_encoded("dataitem"),
         utf8_encoded("1"),
@@ -480,14 +480,14 @@ to_serialized_pair(Item, JustData) when is_binary(Item) ->
     to_serialized_pair(
         #tx{ tags = [{<<"ao-type">>, <<"binary">>}], data = Item }, JustData);
 to_serialized_pair(Item, JustData) ->
-    ?event(debug_test, {to_serialized_pair, Item}),
+    ?event({to_serialized_pair, Item}),
     % TODO: This is a hack to get the ID of the item. We need to do this because we may not
     % have the ID in 'item' if it is just a map/list. We need to make this more efficient.
     Serialized = serialize(Item, JustData),
     Deserialized = deserialize(Serialized),
     UnsignedID = id(Deserialized, unsigned),
     SignedID = id(Deserialized, signed),
-    ?event(debug_test, {serialized_pair,
+    ?event({serialized_pair,
         {unsigned_id, UnsignedID}, {signed_id, SignedID}, {size, byte_size(Serialized)}}),
     {UnsignedID, SignedID, Serialized}.
 
@@ -1079,22 +1079,23 @@ arbundles_item_roundtrip_test() ->
     Serialized = serialize(Item),
     ?assertEqual(Bin, Serialized).
 
-%% @doc Similar test as arbundles_item_roundtrip_test *but* we can't do
-%% a full roundtrip since HyperBEAM explicitly serializes lists as maps
-%% so the full roundtrip will not match.
-arbundles_list_bundle_deserialize_test() ->
+arbundles_list_bundle_roundtrip_test() ->
+    W = ar_wallet:new(),
     {ok, Bin} = file:read_file(<<"test/arbundles.js/ans104-list-bundle.bundle">>),
-    TX = #tx{ 
+    TX = sign_item(#tx{ 
         format = ans104,
         data = Bin,
         data_size = byte_size(Bin),
         tags = ?BUNDLE_TAGS
-    },
-    ?event(debug_test, {serialized, {explicit, TX}}),
-    DeserializedJS = deserialize(TX),
-    ?event(debug_test, {deserialized, {explicit, DeserializedJS}}),
-    ?assertEqual(3, length(DeserializedJS#tx.data)),
-    [Item1, Item2, Item3] = DeserializedJS#tx.data,
+    }, W),
+    ?event(debug_test, {tx, {explicit, TX}}),
+    ?assert(verify_item(TX)),
+
+    Deserialized = deserialize(TX),
+    ?event(debug_test, {deserialized, Deserialized}),
+    ?assertEqual(3, maps:size(Deserialized#tx.data)),
+    #{<<"1">> := Item1, <<"2">> := Item2, <<"3">> := Item3} = 
+        Deserialized#tx.data,
     ?assertEqual(<<"first">>, Item1#tx.data),
     ?assertEqual([{<<"Type">>, <<"list">>}, {<<"Index">>, <<"0">>}], Item1#tx.tags),
     ?assertEqual(
@@ -1117,21 +1118,11 @@ arbundles_list_bundle_deserialize_test() ->
     ?assert(verify_item(Item2)),
     ?assert(verify_item(Item3)),
 
-    % Normalizing the bundle will convert it to a serialized HyperBEAM bundle
-    % (i.e. map instead of list)
-    Normalized = normalize(DeserializedJS),
-    ?event(debug_test, {normalized, {explicit, Normalized}}),
-    ?assertEqual([
-        {<<"bundle-format">>, <<"binary">>},
-        {<<"bundle-version">>, <<"2.0.0">>},
-        {<<"bundle-map">>, hb_util:encode(id(Normalized#tx.manifest, unsigned))}
-    ], Normalized#tx.tags),
-    % Deserialize again so we can verify the data itme
-    DeserializedHB = deserialize(Normalized),
-    ?event(debug_test, {deserialized_hb, DeserializedHB}),
-    ?assertEqual(
-        #{ <<"1">> => Item1, <<"2">> => Item2, <<"3">> => Item3 }, 
-        DeserializedHB#tx.data).
+    Normalized = normalize(Deserialized, true),
+    ?event(debug_test, {normalized, Normalized}),
+    ?assert(verify_item(Normalized)),
+    ?assertEqual(Bin, Normalized#tx.data),
+    ok.
 
 arbundles_single_list_bundle_roundtrip_test() ->
     W = ar_wallet:new(),
@@ -1143,37 +1134,25 @@ arbundles_single_list_bundle_roundtrip_test() ->
         data_size = byte_size(Bin),
         tags = ?BUNDLE_TAGS
     }, W),
+    ?event(debug_test, {tx, {explicit, TX}}),
     ?assert(verify_item(TX)),
-    ?event(debug_test, {serialized, {explicit, TX}}),
-    Deserialized = deserialize(TX),
 
+    Deserialized = deserialize(TX),
+    ?event(debug_test, {deserialized, Deserialized}),
     ?assertEqual(1, maps:size(Deserialized#tx.data)),
     #{<<"1">> := Item} = Deserialized#tx.data,
+    ?event(debug_test, {item, Item}),
+    ?assertEqual(
+        <<"IchWLlJKLaCqKd4KW6BcDKe560XpfgFuPHXjjK8tfgA">>,
+        hb_util:encode(Item#tx.id)),
     ?assertEqual(<<"only">>, Item#tx.data),
     ?assertEqual([{<<"Type">>, <<"list">>}, {<<"Index">>, <<"1">>}], Item#tx.tags),
     ?assert(verify_item(Item)),
 
-    ?event(debug_test, {deserialized, Deserialized}),
-    Reserialized = normalize(Deserialized, true),
-    ?event(debug_test, {reserialized, Reserialized}),
-
-    ?event(debug_test, {original_data, {explicit, TX#tx.data}}),
-    ?event(debug_test, {reserialized_data, {explicit, Reserialized#tx.data}}),
-    ?assert(verify_item(Reserialized)),
-
-    % % Normalizing the bundle will convert it to a serialized HyperBEAM bundle
-    % % (i.e. map instead of list)
-    % Normalized = normalize(DeserializedJS),
-    % ?event(debug_test, {normalized, {explicit, Normalized}}),
-    % ?assertEqual([
-    %     {<<"bundle-format">>, <<"binary">>},
-    %     {<<"bundle-version">>, <<"2.0.0">>},
-    %     {<<"bundle-map">>, hb_util:encode(id(Normalized#tx.manifest, unsigned))}
-    % ], Normalized#tx.tags),
-    % % Deserialize again so we can verify the data itme
-    % DeserializedHB = deserialize(Normalized),
-    % ?event(debug_test, {deserialized_hb, DeserializedHB}),
-    % ?assertEqual(#{ <<"1">> => Item }, DeserializedHB#tx.data),
+    Normalized = normalize(Deserialized, true),
+    ?event(debug_test, {normalized, Normalized}),
+    ?assert(verify_item(Normalized)),
+    ?assertEqual(Bin, Normalized#tx.data),
     ok.
 
 %% @doc This test generates and writes a map bundle to a file so that we can