Fix imports

solana-labs · Oct 14, 2024 · 06a5baf · 06a5baf
1 parent 3dab2a0
commit 06a5baf
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/benches/elf_loader.rs b/benches/elf_loader.rs
@@ -10,10 +10,9 @@ extern crate solana_rbpf;
 extern crate test;
 extern crate test_utils;
 
-use solana_rbpf::program::SyscallRegistry;
 use solana_rbpf::{
     elf::Executable,
-    program::{BuiltinFunction, BuiltinProgram, FunctionRegistry},
+    program::{BuiltinFunction, BuiltinProgram, FunctionRegistry, SyscallRegistry},
     syscalls,
     vm::{Config, TestContextObject},
 };

diff --git a/src/elf.rs b/src/elf.rs
@@ -1164,7 +1164,6 @@ mod test {
     use rand::{distributions::Uniform, Rng};
     use std::{fs::File, io::Read};
     use test_utils::assert_error;
-
     type ElfExecutable = Executable<TestContextObject>;
 
     fn loader() -> Arc<BuiltinProgram<TestContextObject>> {

diff --git a/src/verifier.rs b/src/verifier.rs
@@ -12,10 +12,9 @@
 
 //! Verifies that the bytecode is valid for the given config.
 
-use crate::program::SyscallRegistry;
 use crate::{
     ebpf,
-    program::{BuiltinFunction, FunctionRegistry, SBPFVersion},
+    program::{BuiltinFunction, FunctionRegistry, SBPFVersion, SyscallRegistry},
     vm::{Config, ContextObject},
 };
 use thiserror::Error;

diff --git a/tests/execution.rs b/tests/execution.rs
@@ -15,14 +15,13 @@ extern crate thiserror;
 use byteorder::{ByteOrder, LittleEndian};
 #[cfg(all(not(windows), target_arch = "x86_64"))]
 use rand::{rngs::SmallRng, RngCore, SeedableRng};
-use solana_rbpf::program::SyscallRegistry;
 use solana_rbpf::{
     assembler::assemble,
     declare_builtin_function, ebpf,
     elf::Executable,
     error::{EbpfError, ProgramResult},
     memory_region::{AccessType, MemoryMapping, MemoryRegion},
-    program::{BuiltinFunction, BuiltinProgram, FunctionRegistry, SBPFVersion},
+    program::{BuiltinFunction, BuiltinProgram, FunctionRegistry, SBPFVersion, SyscallRegistry},
     static_analysis::Analysis,
     syscalls,
     verifier::RequisiteVerifier,