refactor(cmd,accountsdb): reorder imports (#594)

This PR doesn't add or subtract anything. It just reorders some imports
and the list of files in style.py. Most of the diff is due to
alphabetizing the imports. I also split up some sections to delineate
different categories of imports from each other.

I'd like to have a standard way to organize imports but I didn't go
through the entire codebase to perfect everything. I just spent a few
minutes taking a small step from chaos to order.

scripts/style.py

@@ -122,66 +122,66 @@ def unused_imports(args, files_to_check):
 
 
 files_excluded_from_line_length_check = [
-    "src/prometheus/metric.zig",
-    "src/prometheus/histogram.zig",
-    "src/prometheus/registry.zig",
-    "src/geyser/core.zig",
-    "src/rpc/request.zig",
-    "src/bincode/shortvec.zig",
-    "src/ledger/database/rocksdb.zig",
-    "src/ledger/database/hashmap.zig",
     "src/accountsdb/bank.zig",
-    "src/net/echo.zig",
-    "src/utils/types.zig",
-    "src/gossip/shards.zig",
-    "src/bloom/bitvec.zig",
-    "src/bincode/int.zig",
-    "src/ledger/benchmarks.zig",
-    "src/core/leader_schedule.zig",
-    "src/shred_network/repair_message.zig",
-    "src/gossip/pull_request.zig",
-    "src/bincode/arraylist.zig",
-    "src/utils/thread.zig",
-    "src/utils/allocators.zig",
-    "src/gossip/message.zig",
-    "src/bloom/bloom.zig",
-    "src/bloom/bit_vec.zig",
-    "src/ledger/result_writer.zig",
-    "src/time/time.zig",
-    "src/utils/tar.zig",
-    "src/utils/fmt.zig",
-    "src/gossip/fuzz_table.zig",
-    "src/bloom/bit_set.zig",
-    "src/accountsdb/sysvars.zig",
-    "src/ledger/shred_inserter/shred_inserter.zig",
-    "src/accountsdb/swiss_map.zig",
-    "src/ledger/shred_inserter/working_state.zig",
-    "src/accountsdb/fuzz_snapshot.zig",
-    "src/shred_network/repair_service.zig",
-    "src/transaction_sender/service.zig",
-    "src/gossip/fuzz_service.zig",
-    "src/sync/thread_pool.zig",
-    "src/transaction_sender/transaction_pool.zig",
-    "src/gossip/ping_pong.zig",
+    "src/accountsdb/db.zig",
     "src/accountsdb/download.zig",
-    "src/ledger/reader.zig",
-    "src/rpc/client.zig",
+    "src/accountsdb/fuzz_snapshot.zig",
     "src/accountsdb/index.zig",
-    "src/ledger/cleanup_service.zig",
-    "src/ledger/reed_solomon.zig",
+    "src/accountsdb/snapshots.zig",
+    "src/accountsdb/swiss_map.zig",
+    "src/accountsdb/sysvars.zig",
     "src/benchmarks.zig",
-    "src/transaction_sender/mock_transfer_generator.zig",
-    "src/core/transaction.zig",
-    "src/net/net.zig",
+    "src/bincode/arraylist.zig",
     "src/bincode/bincode.zig",
-    "src/accountsdb/snapshots.zig",
+    "src/bincode/int.zig",
+    "src/bincode/shortvec.zig",
+    "src/bloom/bit_set.zig",
+    "src/bloom/bit_vec.zig",
+    "src/bloom/bitvec.zig",
+    "src/bloom/bloom.zig",
+    "src/core/leader_schedule.zig",
+    "src/core/transaction.zig",
+    "src/geyser/core.zig",
     "src/gossip/data.zig",
+    "src/gossip/fuzz_service.zig",
+    "src/gossip/fuzz_table.zig",
+    "src/gossip/message.zig",
+    "src/gossip/ping_pong.zig",
+    "src/gossip/pull_request.zig",
     "src/gossip/service.zig",
-    "src/accountsdb/db.zig",
-    "src/rand/rand.zig",
+    "src/gossip/shards.zig",
+    "src/ledger/benchmarks.zig",
+    "src/ledger/cleanup_service.zig",
+    "src/ledger/database/hashmap.zig",
+    "src/ledger/database/rocksdb.zig",
+    "src/ledger/reader.zig",
     "src/ledger/reed_solomon_table.zig",
+    "src/ledger/reed_solomon.zig",
+    "src/ledger/result_writer.zig",
+    "src/ledger/shred_inserter/shred_inserter.zig",
+    "src/ledger/shred_inserter/working_state.zig",
     "src/ledger/shred.zig",
     "src/ledger/test_shreds.zig",
+    "src/net/echo.zig",
+    "src/net/net.zig",
+    "src/prometheus/histogram.zig",
+    "src/prometheus/metric.zig",
+    "src/prometheus/registry.zig",
+    "src/rand/rand.zig",
+    "src/rpc/client.zig",
+    "src/rpc/request.zig",
+    "src/shred_network/repair_message.zig",
+    "src/shred_network/repair_service.zig",
+    "src/sync/thread_pool.zig",
+    "src/time/time.zig",
+    "src/transaction_sender/mock_transfer_generator.zig",
+    "src/transaction_sender/service.zig",
+    "src/transaction_sender/transaction_pool.zig",
+    "src/utils/allocators.zig",
+    "src/utils/fmt.zig",
+    "src/utils/tar.zig",
+    "src/utils/thread.zig",
+    "src/utils/types.zig",
 ]
 
 

src/accountsdb/accounts_file.zig

@@ -3,13 +3,13 @@ const std = @import("std");
 const sig = @import("../sig.zig");
 
 const Account = sig.core.account.Account;
-const Hash = sig.core.hash.Hash;
-const Slot = sig.core.time.Slot;
-const Epoch = sig.core.time.Epoch;
-const Pubkey = sig.core.pubkey.Pubkey;
-const AccountFileInfo = sig.accounts_db.snapshots.AccountFileInfo;
 const AccountDataHandle = sig.accounts_db.buffer_pool.AccountDataHandle;
+const AccountFileInfo = sig.accounts_db.snapshots.AccountFileInfo;
 const BufferPool = sig.accounts_db.buffer_pool.BufferPool;
+const Epoch = sig.core.time.Epoch;
+const Hash = sig.core.hash.Hash;
+const Pubkey = sig.core.pubkey.Pubkey;
+const Slot = sig.core.time.Slot;
 
 const writeIntLittleMem = sig.core.account.writeIntLittleMem;
 

src/accountsdb/bank.zig

@@ -3,8 +3,8 @@ const std = @import("std");
 const sig = @import("../sig.zig");
 
 const AccountsDB = sig.accounts_db.AccountsDB;
-const GenesisConfig = sig.accounts_db.GenesisConfig;
 const BankFields = sig.accounts_db.snapshots.BankFields;
+const GenesisConfig = sig.accounts_db.GenesisConfig;
 const SnapshotManifest = sig.accounts_db.snapshots.Manifest;
 
 // TODO: we can likley come up with a better name for this struct

src/accountsdb/db.zig

@@ -9,30 +9,31 @@ const sysvar = sig.runtime.sysvar;
 const snapgen = sig.accounts_db.snapshots.generate;
 
 const BenchTimeUnit = @import("../benchmarks.zig").BenchTimeUnit;
+
 const ArrayList = std.ArrayList;
 const ArrayListUnmanaged = std.ArrayListUnmanaged;
 const Blake3 = std.crypto.hash.Blake3;
 const KeyPair = std.crypto.sign.Ed25519.KeyPair;
 
-const StatusCache = sig.accounts_db.StatusCache;
 const AccountFile = sig.accounts_db.accounts_file.AccountFile;
 const AccountInFile = sig.accounts_db.accounts_file.AccountInFile;
 const FileId = sig.accounts_db.accounts_file.FileId;
+const StatusCache = sig.accounts_db.StatusCache;
 
 const AccountsDbFields = sig.accounts_db.snapshots.AccountsDbFields;
-const FullAndIncrementalManifest = sig.accounts_db.snapshots.FullAndIncrementalManifest;
 const BankFields = sig.accounts_db.snapshots.BankFields;
 const BankHashStats = sig.accounts_db.snapshots.BankHashStats;
 const BankIncrementalSnapshotPersistence = sig.accounts_db.snapshots.BankIncrementalSnapshotPersistence;
+const FullAndIncrementalManifest = sig.accounts_db.snapshots.FullAndIncrementalManifest;
 const FullSnapshotFileInfo = sig.accounts_db.snapshots.FullSnapshotFileInfo;
 const IncrementalSnapshotFileInfo = sig.accounts_db.snapshots.IncrementalSnapshotFileInfo;
-const SnapshotManifest = sig.accounts_db.snapshots.Manifest;
 const SnapshotFiles = sig.accounts_db.snapshots.SnapshotFiles;
+const SnapshotManifest = sig.accounts_db.snapshots.Manifest;
 
+const AccountDataHandle = sig.accounts_db.buffer_pool.AccountDataHandle;
 const AccountIndex = sig.accounts_db.index.AccountIndex;
 const AccountRef = sig.accounts_db.index.AccountRef;
 const BufferPool = sig.accounts_db.buffer_pool.BufferPool;
-const AccountDataHandle = sig.accounts_db.buffer_pool.AccountDataHandle;
 const PubkeyShardCalculator = sig.accounts_db.index.PubkeyShardCalculator;
 const ShardedPubkeyRefMap = sig.accounts_db.index.ShardedPubkeyRefMap;
 

src/accountsdb/download.zig

@@ -3,16 +3,17 @@
 const std = @import("std");
 const sig = @import("../sig.zig");
 
-const SlotAndHash = sig.core.hash.SlotAndHash;
-const Pubkey = sig.core.Pubkey;
-const GossipTable = sig.gossip.GossipTable;
-const ThreadSafeContactInfo = sig.gossip.data.ThreadSafeContactInfo;
 const GossipService = sig.gossip.GossipService;
+const GossipTable = sig.gossip.GossipTable;
+const KeyPair = std.crypto.sign.Ed25519.KeyPair;
+const LegacyContactInfo = sig.gossip.data.LegacyContactInfo;
 const Logger = sig.trace.Logger;
+const Pubkey = sig.core.Pubkey;
 const ScopedLogger = sig.trace.ScopedLogger;
-const LegacyContactInfo = sig.gossip.data.LegacyContactInfo;
 const SignedGossipData = sig.gossip.data.SignedGossipData;
-const KeyPair = std.crypto.sign.Ed25519.KeyPair;
+const SlotAndHash = sig.core.hash.SlotAndHash;
+const ThreadSafeContactInfo = sig.gossip.data.ThreadSafeContactInfo;
+
 const SnapshotFiles = sig.accounts_db.SnapshotFiles;
 const FullAndIncrementalManifest = sig.accounts_db.FullAndIncrementalManifest;
 

src/accountsdb/fuzz.zig

@@ -2,14 +2,15 @@ const std = @import("std");
 const sig = @import("../sig.zig");
 const zstd = @import("zstd");
 
-const AccountsDB = sig.accounts_db.AccountsDB;
-const ChannelPrintLogger = sig.trace.ChannelPrintLogger;
 const Account = sig.core.Account;
-const Slot = sig.core.time.Slot;
+const ChannelPrintLogger = sig.trace.ChannelPrintLogger;
 const Pubkey = sig.core.pubkey.Pubkey;
+const Slot = sig.core.time.Slot;
+
+const AccountDataHandle = sig.accounts_db.buffer_pool.AccountDataHandle;
+const AccountsDB = sig.accounts_db.AccountsDB;
 const FullSnapshotFileInfo = sig.accounts_db.snapshots.FullSnapshotFileInfo;
 const IncrementalSnapshotFileInfo = sig.accounts_db.snapshots.IncrementalSnapshotFileInfo;
-const AccountDataHandle = sig.accounts_db.buffer_pool.AccountDataHandle;
 
 pub const TrackedAccount = struct {
     pubkey: Pubkey,

src/accountsdb/fuzz_snapshot.zig

@@ -5,12 +5,13 @@ const bincode = sig.bincode;
 
 const Slot = sig.core.Slot;
 const Hash = sig.core.Hash;
-const SnapshotManifest = sig.accounts_db.Manifest;
-const FileId = sig.accounts_db.accounts_file.FileId;
+
+const AccountFileInfo = sig.accounts_db.snapshots.AccountFileInfo;
 const AccountsDbFields = sig.accounts_db.snapshots.AccountsDbFields;
 const BankFields = sig.accounts_db.snapshots.BankFields;
 const ExtraFields = sig.accounts_db.snapshots.ExtraFields;
-const AccountFileInfo = sig.accounts_db.snapshots.AccountFileInfo;
+const FileId = sig.accounts_db.accounts_file.FileId;
+const SnapshotManifest = sig.accounts_db.Manifest;
 
 const MAX_FUZZ_TIME_NS = std.time.ns_per_s * 100_000;
 

src/accountsdb/genesis_config.zig

@@ -6,9 +6,9 @@ const bincode = sig.bincode;
 
 const AutoHashMap = std.AutoHashMap;
 const Account = sig.core.Account;
-const Pubkey = sig.core.Pubkey;
 const Epoch = sig.core.Epoch;
 const EpochSchedule = sig.core.EpochSchedule;
+const Pubkey = sig.core.Pubkey;
 
 pub const UnixTimestamp = i64;
 pub const String = std.ArrayList(u8);

src/accountsdb/index.zig

@@ -2,12 +2,13 @@
 const std = @import("std");
 const sig = @import("../sig.zig");
 
-const Slot = sig.core.time.Slot;
+const DiskMemoryAllocator = sig.utils.allocators.DiskMemoryAllocator;
 const Pubkey = sig.core.pubkey.Pubkey;
-const FileId = sig.accounts_db.accounts_file.FileId;
 const RwMux = sig.sync.RwMux;
+const Slot = sig.core.time.Slot;
+
+const FileId = sig.accounts_db.accounts_file.FileId;
 const SwissMap = sig.accounts_db.swiss_map.SwissMap;
-const DiskMemoryAllocator = sig.utils.allocators.DiskMemoryAllocator;
 
 const createAndMmapFile = sig.utils.allocators.createAndMmapFile;
 

src/accountsdb/lib.zig

@@ -11,13 +11,13 @@ pub const snapshots = @import("snapshots.zig");
 pub const swiss_map = @import("swiss_map.zig");
 
 pub const AccountsDB = db.AccountsDB;
-pub const FullAndIncrementalManifest = snapshots.FullAndIncrementalManifest;
 pub const Bank = bank.Bank;
+pub const ClusterType = genesis_config.ClusterType;
+pub const FullAndIncrementalManifest = snapshots.FullAndIncrementalManifest;
 pub const GenesisConfig = genesis_config.GenesisConfig;
 pub const Manifest = snapshots.Manifest;
 pub const SnapshotFiles = snapshots.SnapshotFiles;
 pub const StatusCache = snapshots.StatusCache;
-pub const ClusterType = genesis_config.ClusterType;
 
 pub const downloadSnapshotsFromGossip = download.downloadSnapshotsFromGossip;
 pub const parallelUnpackZstdTarBall = snapshots.parallelUnpackZstdTarBall;

src/accountsdb/snapshots.zig

@@ -9,20 +9,19 @@ const bincode = sig.bincode;
 
 const Account = sig.core.account.Account;
 const Epoch = sig.core.time.Epoch;
+const EpochSchedule = sig.core.EpochSchedule;
 const Hash = sig.core.hash.Hash;
 const InstructionError = sig.core.instruction.InstructionErrorEnum;
 const Pubkey = sig.core.pubkey.Pubkey;
 const Slot = sig.core.time.Slot;
 const SlotAndHash = sig.core.hash.SlotAndHash;
+const SlotHistory = sig.runtime.sysvar.SlotHistory;
 
-const FileId = sig.accounts_db.accounts_file.FileId;
-
-const EpochSchedule = sig.core.EpochSchedule;
 const FeeRateGovernor = sig.accounts_db.genesis_config.FeeRateGovernor;
+const FileId = sig.accounts_db.accounts_file.FileId;
 const Inflation = sig.accounts_db.genesis_config.Inflation;
 const Rent = sig.accounts_db.genesis_config.Rent;
 const UnixTimestamp = sig.accounts_db.genesis_config.UnixTimestamp;
-const SlotHistory = sig.runtime.sysvar.SlotHistory;
 
 const Logger = sig.trace.Logger;
 

src/accountsdb/swiss_map.zig

@@ -4,9 +4,11 @@
 const builtin = @import("builtin");
 const std = @import("std");
 const sig = @import("../sig.zig");
-const BenchTimeUnit = @import("../benchmarks.zig").BenchTimeUnit;
+
 const accounts_db = sig.accounts_db;
 
+const BenchTimeUnit = @import("../benchmarks.zig").BenchTimeUnit;
+
 pub fn SwissMap(
     comptime Key: type,
     comptime Value: type,

src/cmd.zig

@@ -1,36 +1,36 @@
+const std = @import("std");
 const builtin = @import("builtin");
 const cli = @import("zig-cli");
 const sig = @import("sig.zig");
-const std = @import("std");
 const config = @import("config.zig");
 
 const AccountsDB = sig.accounts_db.AccountsDB;
-const FullAndIncrementalManifest = sig.accounts_db.FullAndIncrementalManifest;
 const Bank = sig.accounts_db.Bank;
-const Slot = sig.core.Slot;
+const BlockstoreReader = sig.ledger.BlockstoreReader;
+const ChannelPrintLogger = sig.trace.ChannelPrintLogger;
+const ClusterType = sig.accounts_db.genesis_config.ClusterType;
 const ContactInfo = sig.gossip.ContactInfo;
+const FullAndIncrementalManifest = sig.accounts_db.FullAndIncrementalManifest;
 const GenesisConfig = sig.accounts_db.GenesisConfig;
+const GeyserWriter = sig.geyser.GeyserWriter;
 const GossipService = sig.gossip.GossipService;
 const IpAddr = sig.net.IpAddr;
+const LeaderSchedule = sig.core.leader_schedule.LeaderSchedule;
+const LeaderScheduleCache = sig.core.leader_schedule.LeaderScheduleCache;
 const Logger = sig.trace.Logger;
-const ChannelPrintLogger = sig.trace.ChannelPrintLogger;
 const Pubkey = sig.core.Pubkey;
-const LeaderSchedule = sig.core.leader_schedule.LeaderSchedule;
+const Slot = sig.core.Slot;
 const SnapshotFiles = sig.accounts_db.SnapshotFiles;
 const SocketAddr = sig.net.SocketAddr;
-const StatusCache = sig.accounts_db.StatusCache;
-const LeaderScheduleCache = sig.core.leader_schedule.LeaderScheduleCache;
-const ClusterType = sig.accounts_db.genesis_config.ClusterType;
-const BlockstoreReader = sig.ledger.BlockstoreReader;
 const SocketTag = sig.gossip.SocketTag;
-const GeyserWriter = sig.geyser.GeyserWriter;
+const StatusCache = sig.accounts_db.StatusCache;
 
+const createGeyserWriter = sig.geyser.core.createGeyserWriter;
 const downloadSnapshotsFromGossip = sig.accounts_db.downloadSnapshotsFromGossip;
-const globalRegistry = sig.prometheus.globalRegistry;
+const getShredAndIPFromEchoServer = sig.net.echo.getShredAndIPFromEchoServer;
 const getWallclockMs = sig.time.getWallclockMs;
+const globalRegistry = sig.prometheus.globalRegistry;
 const spawnMetrics = sig.prometheus.spawnMetrics;
-const getShredAndIPFromEchoServer = sig.net.echo.getShredAndIPFromEchoServer;
-const createGeyserWriter = sig.geyser.core.createGeyserWriter;
 
 var gpa = std.heap.GeneralPurposeAllocator(.{}){};
 const gpa_allocator = if (builtin.mode == .Debug)