Skip to content

chore(testing): use random seed instead of hardcoding #985

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(testing): use random seed instead of hardcoding #985

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
2 changes: 1 addition & 1 deletion conformance/src/utils.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ pub fn createTransactionContext(
.return_data = .{},
.accounts_resize_delta = 0,
.compute_meter = instr_ctx.cu_avail,
.compute_budget = sig.runtime.ComputeBudget.default(instr_ctx.cu_avail),
.compute_budget = .init(instr_ctx.cu_avail),
.custom_error = null,
.log_collector = sig.runtime.LogCollector.default(),
.rent = sysvar_cache.get(sysvar.Rent) catch sysvar.Rent.DEFAULT,
Expand Down
20 changes: 10 additions & 10 deletions src/accountsdb/db.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3512,7 +3512,7 @@ test "write and read an account - basic" {
defer accounts_db.deinit();
defer dir.cleanup();

var prng = std.Random.DefaultPrng.init(0);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const pubkey = Pubkey.initRandom(prng.random());
var data = [_]u8{ 1, 2, 3 };
const test_account = Account{
Expand Down Expand Up @@ -3547,7 +3547,7 @@ test "write and read an account (write single + read with ancestors)" {
defer accounts_db.deinit();
defer dir.cleanup();

var prng = std.Random.DefaultPrng.init(0);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const pubkey = Pubkey.initRandom(prng.random());

var data = [_]u8{ 1, 2, 3 };
Expand Down Expand Up @@ -3836,7 +3836,7 @@ test "generate snapshot & update gossip snapshot hashes" {

const allocator = std.testing.allocator;

var prng = std.Random.DefaultPrng.init(123); // TODO: use `std.testing.random_seed` when we update
var prng = std.Random.DefaultPrng.init(std.testing.random_seed); // TODO: use `std.testing.random_seed` when we update
const random = prng.random();

var tmp_dir_root = std.testing.tmpDir(.{});
Expand Down Expand Up @@ -4300,7 +4300,7 @@ pub const BenchmarkAccountsDB = struct {
std.math.ceilPowerOfTwo(usize, total_n_accounts) catch total_n_accounts,
);

var prng = std.Random.DefaultPrng.init(19);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

var pubkeys = try allocator.alloc(Pubkey, n_accounts);
Expand Down Expand Up @@ -4497,7 +4497,7 @@ test "read/write benchmark disk" {

test "insert multiple accounts on same slot" {
const allocator = std.testing.allocator;
var prng = std.Random.DefaultPrng.init(0);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

// Initialize empty accounts db
Expand Down Expand Up @@ -4578,7 +4578,7 @@ fn expectedAccountSharedDataEqualsAccount(

test "insert multiple accounts on multiple slots" {
const allocator = std.testing.allocator;
var prng = std.Random.DefaultPrng.init(0);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

var accounts_db, var tmp_dir = try AccountsDB.initForTest(allocator);
Expand Down Expand Up @@ -4617,7 +4617,7 @@ test "insert multiple accounts on multiple slots" {

test "insert account on multiple slots" {
const allocator = std.testing.allocator;
var prng = std.Random.DefaultPrng.init(0);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

var accounts_db, var tmp_dir = try AccountsDB.initForTest(allocator);
Expand Down Expand Up @@ -4666,7 +4666,7 @@ test "insert account on multiple slots" {

test "missing ancestor returns null" {
const allocator = std.testing.allocator;
var prng = std.Random.DefaultPrng.init(5083);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

var accounts_db, var tmp_dir = try AccountsDB.initForTest(allocator);
Expand All @@ -4688,7 +4688,7 @@ test "missing ancestor returns null" {

test "overwrite account in same slot" {
const allocator = std.testing.allocator;
var prng = std.Random.DefaultPrng.init(5083);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

var accounts_db, var tmp_dir = try AccountsDB.initForTest(allocator);
Expand Down Expand Up @@ -4721,7 +4721,7 @@ test "overwrite account in same slot" {

test "insert many duplicate individual accounts, get latest with ancestors" {
const allocator = std.testing.allocator;
var prng = std.Random.DefaultPrng.init(5083);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();
var accounts_db, var tmp_dir = try AccountsDB.initForTest(allocator);
defer tmp_dir.cleanup();
Expand Down
22 changes: 11 additions & 11 deletions src/accountsdb/manager.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pub fn onSlotRooted(

// TODO: get rid of this once `generateFullSnapshot` can actually
// derive this data correctly by itdb.
var prng = std.Random.DefaultPrng.init(1234);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
var tmp_bank_fields = try BankFields.initRandom(allocator, prng.random(), 128);
defer tmp_bank_fields.deinit(allocator);

Expand Down Expand Up @@ -944,7 +944,7 @@ test "flushing slots works" {
});
defer accounts_db.deinit();

var prng = std.Random.DefaultPrng.init(19);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();
const n_accounts = 3;

Expand Down Expand Up @@ -1005,7 +1005,7 @@ test "purge accounts in cache works" {
});
defer accounts_db.deinit();

var prng = std.Random.DefaultPrng.init(19);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();
const n_accounts = 3;

Expand Down Expand Up @@ -1063,7 +1063,7 @@ test "clean to shrink account file works with zero-lamports" {
defer accounts_db.deinit();
defer dir.cleanup();

var prng = std.Random.DefaultPrng.init(19);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();
const n_accounts = 10;

Expand Down Expand Up @@ -1139,7 +1139,7 @@ test "clean to shrink account file works - basic" {
defer accounts_db.deinit();
defer dir.cleanup();

var prng = std.Random.DefaultPrng.init(19);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();
const n_accounts = 10;

Expand Down Expand Up @@ -1219,7 +1219,7 @@ test "full clean account file works" {
});
defer accounts_db.deinit();

var prng = std.Random.DefaultPrng.init(19);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();
const n_accounts = 3;

Expand Down Expand Up @@ -1337,7 +1337,7 @@ test "shrink account file works" {
});
defer accounts_db.deinit();

var prng = std.Random.DefaultPrng.init(19);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

const n_accounts = 10;
Expand Down Expand Up @@ -1481,7 +1481,7 @@ test "shrink account file works" {
test "onSlotRooted basic" {
const allocator = std.testing.allocator;
const logger: Logger = .noop;
var prng = std.Random.DefaultPrng.init(5083);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

var tmp_dir_root = std.testing.tmpDir(.{});
Expand Down Expand Up @@ -1543,7 +1543,7 @@ test "onSlotRooted basic" {
test "onSlotRooted zero_lamports" {
const allocator = std.testing.allocator;
const logger: Logger = .noop;
var prng = std.Random.DefaultPrng.init(5083);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

var tmp_dir_root = std.testing.tmpDir(.{});
Expand Down Expand Up @@ -1580,7 +1580,7 @@ test "onSlotRooted zero_lamports" {
test "onSlotRooted shrink and delete" {
const allocator = std.testing.allocator;
const logger: Logger = .noop;
var prng = std.Random.DefaultPrng.init(5083);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

var tmp_dir_root = std.testing.tmpDir(.{});
Expand Down Expand Up @@ -1661,7 +1661,7 @@ test "onSlotRooted shrink and delete" {
test "snapshot generation happens without error" {
const allocator = std.testing.allocator;
const logger: Logger = .noop;
var prng = std.Random.DefaultPrng.init(5083);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

var tmp_dir_root = std.testing.tmpDir(.{ .iterate = true });
Expand Down
4 changes: 2 additions & 2 deletions src/accountsdb/snapshot/download.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ test "accounts_db.download: test remove untrusted peers" {
var table = try GossipTable.init(allocator, allocator);
defer table.deinit();

var prng = std.Random.DefaultPrng.init(0);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

const my_shred_version: usize = 19;
Expand Down Expand Up @@ -740,7 +740,7 @@ test "accounts_db.download: test finding peers" {
var table = try GossipTable.init(allocator, allocator);
defer table.deinit();

var prng = std.Random.DefaultPrng.init(0);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

const my_shred_version: usize = 19;
Expand Down
14 changes: 7 additions & 7 deletions src/accountsdb/swiss_map.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ pub fn SwissMapUnmanaged(
memory.len / (@sizeOf([GROUP_SIZE]KeyValue) + @sizeOf([GROUP_SIZE]State));

const group_size = n_groups * @sizeOf([GROUP_SIZE]KeyValue);
const group_ptr: [*][GROUP_SIZE]KeyValue = @alignCast(@ptrCast(memory.ptr));
const group_ptr: [*][GROUP_SIZE]KeyValue = @ptrCast(@alignCast(memory.ptr));
const groups = group_ptr[0..n_groups];
const states_ptr: [*]@Vector(GROUP_SIZE, u8) =
@alignCast(@ptrCast(memory.ptr + group_size));
@ptrCast(@alignCast(memory.ptr + group_size));
const states = states_ptr[0..n_groups];

self._capacity = n_groups * GROUP_SIZE;
Expand Down Expand Up @@ -226,10 +226,10 @@ pub fn SwissMapUnmanaged(
errdefer comptime unreachable;
@memset(memory, 0);

const group_ptr: [*][GROUP_SIZE]KeyValue = @alignCast(@ptrCast(memory.ptr));
const group_ptr: [*][GROUP_SIZE]KeyValue = @ptrCast(@alignCast(memory.ptr));
const groups = group_ptr[0..n_groups];
const states_ptr: [*]@Vector(GROUP_SIZE, u8) =
@alignCast(@ptrCast(memory.ptr + group_size));
@ptrCast(@alignCast(memory.ptr + group_size));
const states = states_ptr[0..n_groups];

self._capacity = n_groups * GROUP_SIZE;
Expand All @@ -250,10 +250,10 @@ pub fn SwissMapUnmanaged(
errdefer comptime unreachable;
@memset(memory, 0);

const group_ptr: [*][GROUP_SIZE]KeyValue = @alignCast(@ptrCast(memory.ptr));
const group_ptr: [*][GROUP_SIZE]KeyValue = @ptrCast(@alignCast(memory.ptr));
const groups = group_ptr[0..n_groups];
const states_ptr: [*]@Vector(GROUP_SIZE, u8) =
@alignCast(@ptrCast(memory.ptr + group_size));
@ptrCast(@alignCast(memory.ptr + group_size));
const states = states_ptr[0..n_groups];

var new_self = Self{
Expand Down Expand Up @@ -740,7 +740,7 @@ fn generateData(allocator: std.mem.Allocator, n_accounts: usize) !struct {
[]accounts_db.index.AccountRef,
[]sig.core.Pubkey,
} {
var prng = std.Random.DefaultPrng.init(0);
var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
const random = prng.random();

const account_refs = try allocator.alloc(accounts_db.index.AccountRef, n_accounts);
Expand Down
5 changes: 1 addition & 4 deletions src/cmd.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,10 +1509,7 @@ fn createSnapshot(allocator: std.mem.Allocator, cfg: config.Cmd) !void {
_ = try accounts_db.generateFullSnapshot(.{
.target_slot = slot,
.bank_fields = &loaded_snapshot.combined_manifest.full.bank_fields,
.lamports_per_signature = lps: {
var prng = std.Random.DefaultPrng.init(1234);
break :lps prng.random().int(u64);
},
.lamports_per_signature = 123_456_567, // TODO: make this a real number
.old_snapshot_action = .delete_old,
});
}
Expand Down
Loading