Skip to content

Replace ArrayList with BoundedArray in List type #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
guha-rahul wants to merge 1 commit into from
Closed

Replace ArrayList with BoundedArray in List type #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/beacon_tests.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ test "List[Validator] serialization and hash tree root" {
const MAX_VALIDATORS = 100;
const ValidatorList = utils.List(Validator, MAX_VALIDATORS);

var validator_list = try ValidatorList.init(std.testing.allocator);
var validator_list = ValidatorList.init();
defer validator_list.deinit();

// Add test validators
Expand Down Expand Up @@ -168,7 +168,7 @@ test "List[Validator] serialization and hash tree root" {
try expect(std.mem.eql(u8, list.items, &expected_validator_list_bytes));

// Test deserialization
var deserialized_list = try ValidatorList.init(std.testing.allocator);
var deserialized_list = ValidatorList.init();
defer deserialized_list.deinit();
try deserialize(ValidatorList, list.items, &deserialized_list, std.testing.allocator);

Expand Down Expand Up @@ -237,7 +237,7 @@ test "BeamBlockBody with validator array - full cycle" {
};

// Create validator array
var validators = try ValidatorArray.init(std.testing.allocator);
var validators = ValidatorArray.init();
defer validators.deinit();
try validators.append(validator1);
try validators.append(validator2);
Expand All @@ -258,7 +258,7 @@ test "BeamBlockBody with validator array - full cycle" {

// Test deserialization
var deserialized_body: BeamBlockBody = undefined;
deserialized_body.validators = try ValidatorArray.init(std.testing.allocator);
deserialized_body.validators = ValidatorArray.init();
defer deserialized_body.validators.deinit();
try deserialize(BeamBlockBody, serialized_data.items, &deserialized_body, std.testing.allocator);

Expand Down Expand Up @@ -333,7 +333,7 @@ test "Zeam-style List/Bitlist usage with tree root stability" {
justified_slots: JustifiedSlots,
};

var votes = try Mini3SFVotes.init(std.testing.allocator);
var votes = Mini3SFVotes.init();
defer votes.deinit();
try votes.append(Mini3SFVote{
.validator_id = 1,
Expand All @@ -343,7 +343,7 @@ test "Zeam-style List/Bitlist usage with tree root stability" {
.source = Mini3SFCheckpoint{ .root = [_]u8{3} ** 32, .slot = 8 },
});

var hashes = try HistoricalBlockHashes.init(std.testing.allocator);
var hashes = HistoricalBlockHashes.init();
defer hashes.deinit();
try hashes.append([_]u8{0xaa} ** 32);
try hashes.append([_]u8{0xbb} ** 32);
Expand Down Expand Up @@ -416,7 +416,7 @@ test "BeamState with historical roots - comprehensive test" {
finalized_checkpoint_root: Root,
};

var historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
var historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer historical_roots.deinit();

try historical_roots.append([_]u8{0x01} ** 32);
Expand Down Expand Up @@ -461,7 +461,7 @@ test "BeamState with historical roots - comprehensive test" {

// Test deserialization
var deserialized_state: BeamState = undefined;
deserialized_state.historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
deserialized_state.historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer deserialized_state.historical_roots.deinit();
try deserialize(BeamState, serialized_data.items, &deserialized_state, std.testing.allocator);

Expand Down Expand Up @@ -507,7 +507,7 @@ test "BeamState with empty historical roots" {
};

// Create BeamState with empty historical roots
var empty_historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
var empty_historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer empty_historical_roots.deinit();

const beam_state = SimpleBeamState{
Expand Down Expand Up @@ -536,7 +536,7 @@ test "BeamState with empty historical roots" {

// Test deserialization
var deserialized_state: SimpleBeamState = undefined;
deserialized_state.historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
deserialized_state.historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer deserialized_state.historical_roots.deinit();
try deserialize(SimpleBeamState, serialized_data.items, &deserialized_state, std.testing.allocator);

Expand Down Expand Up @@ -565,7 +565,7 @@ test "BeamState with maximum historical roots" {
};

// Create BeamState with maximum historical roots
var max_historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
var max_historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer max_historical_roots.deinit();

// Fill to maximum capacity
Expand Down Expand Up @@ -603,7 +603,7 @@ test "BeamState with maximum historical roots" {

// Test deserialization
var deserialized_state: MaxBeamState = undefined;
deserialized_state.historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
deserialized_state.historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer deserialized_state.historical_roots.deinit();
try deserialize(MaxBeamState, serialized_data.items, &deserialized_state, std.testing.allocator);

Expand Down Expand Up @@ -636,7 +636,7 @@ test "BeamState historical roots access and comparison" {
metadata: u64,
};

var historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
var historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer historical_roots.deinit();

// Add roots with specific patterns
Expand Down Expand Up @@ -682,7 +682,7 @@ test "BeamState historical roots access and comparison" {

// Test deserialization
var deserialized_state: AccessBeamState = undefined;
deserialized_state.historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
deserialized_state.historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer deserialized_state.historical_roots.deinit();
try deserialize(AccessBeamState, serialized_data.items, &deserialized_state, std.testing.allocator);

Expand Down Expand Up @@ -724,7 +724,7 @@ test "SimpleBeamState with empty historical roots" {
};

// Create BeamState with empty historical roots
var empty_historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
var empty_historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer empty_historical_roots.deinit();

const beam_state = SimpleBeamState{
Expand Down Expand Up @@ -752,7 +752,7 @@ test "SimpleBeamState with empty historical roots" {

// Test deserialization
var deserialized_state: SimpleBeamState = undefined;
deserialized_state.historical_roots = try utils.List(Root, MAX_HISTORICAL_ROOTS).init(std.testing.allocator);
deserialized_state.historical_roots = utils.List(Root, MAX_HISTORICAL_ROOTS).init();
defer deserialized_state.historical_roots.deinit();
try deserialize(SimpleBeamState, serialized_data.items, &deserialized_state, std.testing.allocator);

Expand Down
50 changes: 25 additions & 25 deletions src/tests.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,23 +670,23 @@ test "calculate the root hash of an union" {
test "(de)serialize List[N] of fixed-length objects" {
const MAX_VALIDATORS_PER_COMMITTEE: usize = 2048;
const ListValidatorIndex = utils.List(u64, MAX_VALIDATORS_PER_COMMITTEE);
var attesting_indices = try ListValidatorIndex.init(std.testing.allocator);
var attesting_indices = ListValidatorIndex.init();
defer attesting_indices.deinit();
for (0..10) |i| {
try attesting_indices.append(i * 100);
}
var list = ArrayList(u8).init(std.testing.allocator);
defer list.deinit();
try serialize(ListValidatorIndex, attesting_indices, &list);
var attesting_indices_deser = try ListValidatorIndex.init(std.testing.allocator);
var attesting_indices_deser = ListValidatorIndex.init();
defer attesting_indices_deser.deinit();
try deserialize(ListValidatorIndex, list.items, &attesting_indices_deser, std.testing.allocator);
try expect(attesting_indices.eql(&attesting_indices_deser));
}

test "(de)serialize List[N] of variable-length objects" {
const ListOfStrings = utils.List([]const u8, 16);
var string_list = try ListOfStrings.init(std.testing.allocator);
var string_list = ListOfStrings.init();
defer string_list.deinit();
for (0..10) |i| {
try string_list.append(try std.fmt.allocPrint(std.testing.allocator, "count={}", .{i}));
Expand All @@ -697,7 +697,7 @@ test "(de)serialize List[N] of variable-length objects" {
var list = ArrayList(u8).init(std.testing.allocator);
defer list.deinit();
try serialize(ListOfStrings, string_list, &list);
var string_list_deser = try ListOfStrings.init(std.testing.allocator);
var string_list_deser = ListOfStrings.init();
defer string_list_deser.deinit();
try deserialize(ListOfStrings, list.items, &string_list_deser, std.testing.allocator);
try expect(string_list.len() == string_list_deser.len());
Expand All @@ -711,7 +711,7 @@ test "List[N].fromSlice of structs" {
var start: usize = 0;
var end: usize = pastries.len;
_ = .{ &start, &end };
var pastry_list = try PastryList.fromSlice(std.testing.allocator, pastries[start..end]);
var pastry_list = try PastryList.fromSlice(pastries[start..end]);
defer pastry_list.deinit();
for (pastries, 0..) |pastry, i| {
try expect(std.mem.eql(u8, (try pastry_list.get(i)).name, pastry.name));
Expand Down Expand Up @@ -960,9 +960,9 @@ test "slice hashtree root simple type" {
test "List tree root calculation" {
const ListU64 = utils.List(u64, 1024);

var empty_list = try ListU64.init(std.testing.allocator);
var empty_list = ListU64.init();
defer empty_list.deinit();
var list_with_items = try ListU64.init(std.testing.allocator);
var list_with_items = ListU64.init();
defer list_with_items.deinit();
try list_with_items.append(42);
try list_with_items.append(123);
Expand All @@ -978,7 +978,7 @@ test "List tree root calculation" {

try expect(!std.mem.eql(u8, &empty_hash, &filled_hash));

var same_content_list = try ListU64.init(std.testing.allocator);
var same_content_list = ListU64.init();
defer same_content_list.deinit();
try same_content_list.append(42);
try same_content_list.append(123);
Expand Down Expand Up @@ -1026,15 +1026,15 @@ test "Bitlist tree root calculation" {
test "List of composite types tree root" {
const ListOfPastry = utils.List(Pastry, 100);

var pastry_list = try ListOfPastry.init(std.testing.allocator);
var pastry_list = ListOfPastry.init();
defer pastry_list.deinit();
try pastry_list.append(Pastry{ .name = "croissant", .weight = 20 });
try pastry_list.append(Pastry{ .name = "muffin", .weight = 30 });

var hash1: [32]u8 = undefined;
try hashTreeRoot(Sha256, ListOfPastry, pastry_list, &hash1, std.testing.allocator);

var pastry_list2 = try ListOfPastry.init(std.testing.allocator);
var pastry_list2 = ListOfPastry.init();
defer pastry_list2.deinit();
try pastry_list2.append(Pastry{ .name = "croissant", .weight = 20 });
try pastry_list2.append(Pastry{ .name = "muffin", .weight = 30 });
Expand All @@ -1054,7 +1054,7 @@ test "List of composite types tree root" {
test "serializedSize correctly calculates List/Bitlist sizes" {
// Test List size calculation
const ListType = utils.List(u64, 100);
var list = try ListType.init(std.testing.allocator);
var list = ListType.init();
defer list.deinit();
try list.append(123);
try list.append(456);
Expand Down Expand Up @@ -1279,7 +1279,7 @@ test "serialize max/min integer values" {

test "Empty List hash tree root" {
const ListU32 = utils.List(u32, 100);
var empty_list = try ListU32.init(std.testing.allocator);
var empty_list = ListU32.init();
defer empty_list.deinit();

var hash: [32]u8 = undefined;
Expand Down Expand Up @@ -1331,7 +1331,7 @@ test "Empty BitList (>256) hash tree root" {

test "List at maximum capacity" {
const ListU8 = utils.List(u8, 4);
var full_list = try ListU8.init(std.testing.allocator);
var full_list = ListU8.init();
defer full_list.deinit();

// Fill to capacity
Expand Down Expand Up @@ -1515,7 +1515,7 @@ test "uint256 hash tree root" {

test "Single element List" {
const ListU64 = utils.List(u64, 10);
var single = try ListU64.init(std.testing.allocator);
var single = ListU64.init();
defer single.deinit();
try single.append(42);

Expand Down Expand Up @@ -1667,7 +1667,7 @@ test "decodeDynamicLength - comprehensive validation" {
}

test "List validation - size limits enforced" {
var list = try utils.List(u32, 3).init(std.testing.allocator);
var list = utils.List(u32, 3).init();
defer list.deinit();

// Test oversized fixed-size list
Expand Down Expand Up @@ -1734,7 +1734,7 @@ test "Bitlist init consistency with List" {
const TestList = utils.List(u32, 10);
const TestBitlist = utils.Bitlist(10);

var list = try TestList.init(std.testing.allocator);
var list = TestList.init();
defer list.deinit();
var bitlist = try TestBitlist.init(std.testing.allocator);
defer bitlist.deinit();
Expand All @@ -1744,7 +1744,7 @@ test "Bitlist init consistency with List" {
try expect(bitlist.len() == 0);

// Both should have reserved capacity but no actual elements
try expect(list.inner.items.len == 0);
try expect(list.inner.len == 0);
try expect(bitlist.inner.items.len == 0);
}

Expand Down Expand Up @@ -1897,21 +1897,21 @@ test "SSZ external reference vectors" {
test "List fromSlice overflow rejection" {
const TestList = utils.List(u32, 2);
const oversized_slice = [_]u32{ 1, 2, 3, 4 };
const result = TestList.fromSlice(std.testing.allocator, &oversized_slice);
const result = TestList.fromSlice(&oversized_slice);
try expectError(error.Overflow, result);
}

test "List fromSlice at exact capacity" {
const TestList = utils.List(u32, 3);
const exact_slice = [_]u32{ 10, 20, 30 };
var list = try TestList.fromSlice(std.testing.allocator, &exact_slice);
var list = try TestList.fromSlice(&exact_slice);
defer list.deinit();
try expect(list.len() == 3);
}

test "Zero capacity List" {
const TestList = utils.List(u32, 0);
var list = try TestList.init(std.testing.allocator);
var list = TestList.init();
defer list.deinit();
try expect(list.len() == 0);
try expectError(error.Overflow, list.append(1));
Expand All @@ -1927,7 +1927,7 @@ test "Zero capacity Bitlist" {

test "Large capacity List overflow" {
const TestList = utils.List(u8, 1000);
var list = try TestList.init(std.testing.allocator);
var list = TestList.init();
defer list.deinit();

var i: usize = 0;
Expand Down Expand Up @@ -2046,7 +2046,7 @@ test "nested dynamic list uses relative offsets" {
dynamic_list: InnerList, // variable
};

var inner_list = try InnerList.init(std.testing.allocator);
var inner_list = InnerList.init();
defer inner_list.deinit();

const item1: []const u8 = "hello";
Expand Down Expand Up @@ -2119,16 +2119,16 @@ test "deeply nested dynamic structures use relative offsets" {
nested_lists: OuterList,
};

var inner1 = try InnerList.init(std.testing.allocator);
var inner1 = InnerList.init();
defer inner1.deinit();
try inner1.append("a");
try inner1.append("bb");

var inner2 = try InnerList.init(std.testing.allocator);
var inner2 = InnerList.init();
defer inner2.deinit();
try inner2.append("ccc");

var outer_list = try OuterList.init(std.testing.allocator);
var outer_list = OuterList.init();
defer outer_list.deinit();
try outer_list.append(inner1);
try outer_list.append(inner2);
Expand Down
Loading