Skip to content

Commit

Permalink
fixup! fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesPiechota committed Sep 8, 2024
1 parent 7781562 commit 7703c54
Showing 1 changed file with 17 additions and 19 deletions.
36 changes: 17 additions & 19 deletions apps/arweave/src/ar_packing_server.erl
Original file line number Diff line number Diff line change
Expand Up @@ -735,29 +735,27 @@ pack_test() ->
{crypto:strong_rand_bytes(256 * 1024 - 1), 100000000000000,
crypto:strong_rand_bytes(32)}
],
Schedulers = erlang:system_info(dirty_cpu_schedulers_online),
State512 = ar_mine_randomx:init_fast(rx512, <<1>>, Schedulers),
State4096 = ar_mine_randomx:init_fast(rx4096, <<1>>, Schedulers),
PackingState = init_packing_state(),
PackedList = lists:flatten(lists:map(
fun({Chunk, Offset, TXRoot}) ->
ECDSA = ar_wallet:to_address(ar_wallet:new({ecdsa, secp256k1})),
EDDSA = ar_wallet:to_address(ar_wallet:new({eddsa, ed25519})),
{ok, Chunk, already_packed} = pack(unpacked, Offset, TXRoot, Chunk,
State512, external),
PackingState, external),
{ok, Packed, was_not_already_packed} = pack(spora_2_5, Offset, TXRoot, Chunk,
State512, external),
PackingState, external),
{ok, Packed2, was_not_already_packed} = pack({spora_2_6, ECDSA}, Offset, TXRoot,
Chunk, State512, external),
Chunk, PackingState, external),
{ok, Packed3, was_not_already_packed} = pack({spora_2_6, EDDSA}, Offset, TXRoot,
Chunk, State512, external),
Chunk, PackingState, external),
{ok, Packed4, was_not_already_packed} = pack({composite, ECDSA, 1}, Offset, TXRoot,
Chunk, State4096, external),
Chunk, PackingState, external),
{ok, Packed5, was_not_already_packed} = pack({composite, EDDSA, 1}, Offset, TXRoot,
Chunk, State4096, external),
Chunk, PackingState, external),
{ok, Packed6, was_not_already_packed} = pack({composite, ECDSA, 2}, Offset, TXRoot,
Chunk, State4096, external),
Chunk, PackingState, external),
{ok, Packed7, was_not_already_packed} = pack({composite, EDDSA, 2}, Offset, TXRoot,
Chunk, State4096, external),
Chunk, PackingState, external),
?assertNotEqual(Packed, Chunk),
?assertNotEqual(Packed2, Chunk),
?assertNotEqual(Packed3, Chunk),
Expand All @@ -766,29 +764,29 @@ pack_test() ->
?assertNotEqual(Packed6, Chunk),
?assertNotEqual(Packed7, Chunk),
?assertEqual({ok, Packed, already_unpacked},
unpack(unpacked, Offset, TXRoot, Packed, byte_size(Chunk), State512,
unpack(unpacked, Offset, TXRoot, Packed, byte_size(Chunk), PackingState,
internal)),
?assertEqual({ok, Chunk, was_not_already_unpacked},
unpack(spora_2_5, Offset, TXRoot, Packed, byte_size(Chunk), State512,
unpack(spora_2_5, Offset, TXRoot, Packed, byte_size(Chunk), PackingState,
internal)),
?assertEqual({ok, Chunk, was_not_already_unpacked},
unpack({spora_2_6, ECDSA}, Offset, TXRoot, Packed2, byte_size(Chunk),
State512, internal)),
PackingState, internal)),
?assertEqual({ok, Chunk, was_not_already_unpacked},
unpack({spora_2_6, EDDSA}, Offset, TXRoot, Packed3, byte_size(Chunk),
State512, internal)),
PackingState, internal)),
?assertEqual({ok, Chunk, was_not_already_unpacked},
unpack({composite, ECDSA, 1}, Offset, TXRoot, Packed4, byte_size(Chunk),
State4096, internal)),
PackingState, internal)),
?assertEqual({ok, Chunk, was_not_already_unpacked},
unpack({composite, EDDSA, 1}, Offset, TXRoot, Packed5, byte_size(Chunk),
State4096, internal)),
PackingState, internal)),
?assertEqual({ok, Chunk, was_not_already_unpacked},
unpack({composite, ECDSA, 2}, Offset, TXRoot, Packed6, byte_size(Chunk),
State4096, internal)),
PackingState, internal)),
?assertEqual({ok, Chunk, was_not_already_unpacked},
unpack({composite, EDDSA, 2}, Offset, TXRoot, Packed7, byte_size(Chunk),
State4096, internal)),
PackingState, internal)),
[Packed, Packed2, Packed3, Packed4, Packed5, Packed6, Packed7]
end,
Cases
Expand Down

0 comments on commit 7703c54

Please sign in to comment.