From c79a5a51b911c18d518796f82a6267871c0b94ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Blankfors?= <marten@blankfors.se>
Date: Thu, 5 Sep 2024 21:20:20 +0200
Subject: [PATCH] chore: Remove unused dependencies in binaries

---
 fuel-vm/fuzz/Cargo.toml               | 13 -------------
 fuel-vm/fuzz/src/{ => bin}/collect.rs | 17 +++--------------
 fuel-vm/fuzz/src/{ => bin}/execute.rs | 18 +++---------------
 fuel-vm/fuzz/src/{ => bin}/seed.rs    | 10 +---------
 fuel-vm/fuzz/src/lib.rs               |  1 -
 5 files changed, 7 insertions(+), 52 deletions(-)
 rename fuel-vm/fuzz/src/{ => bin}/collect.rs (69%)
 rename fuel-vm/fuzz/src/{ => bin}/execute.rs (59%)
 rename fuel-vm/fuzz/src/{ => bin}/seed.rs (73%)

diff --git a/fuel-vm/fuzz/Cargo.toml b/fuel-vm/fuzz/Cargo.toml
index c4ec5e5677..f721c90046 100644
--- a/fuel-vm/fuzz/Cargo.toml
+++ b/fuel-vm/fuzz/Cargo.toml
@@ -37,16 +37,3 @@ name = "grammar_aware_advanced"
 path = "fuzz_targets/grammar_aware_advanced.rs"
 test = false
 doc = false
-
-[[bin]]
-name = "seed"
-path = "src/seed.rs"
-
-[[bin]]
-name = "execute"
-path = "src/execute.rs"
-
-[[bin]]
-name = "collect"
-path = "src/collect.rs"
-
diff --git a/fuel-vm/fuzz/src/collect.rs b/fuel-vm/fuzz/src/bin/collect.rs
similarity index 69%
rename from fuel-vm/fuzz/src/collect.rs
rename to fuel-vm/fuzz/src/bin/collect.rs
index 3f3a4e7376..47cdb9b142 100644
--- a/fuel-vm/fuzz/src/collect.rs
+++ b/fuel-vm/fuzz/src/bin/collect.rs
@@ -1,20 +1,9 @@
-use crate::fs::File;
-use fuel_vm::consts::WORD_SIZE;
-use fuel_vm::fuel_asm::op;
-use fuel_vm::fuel_asm::RegId;
-use fuel_vm::fuel_asm::{Instruction, RawInstruction};
-use fuel_vm::fuel_crypto::rand::Rng;
-use fuel_vm::fuel_crypto::rand::SeedableRng;
-use fuel_vm::fuel_types::Word;
-use fuel_vm::prelude::SecretKey;
+use std::fs::File;
 use fuel_vm_fuzz::execute;
-use fuel_vm_fuzz::FuzzData;
-use fuel_vm_fuzz::{decode, decode_instructions, encode};
-use std::convert::TryFrom;
-use std::convert::TryInto;
+use fuel_vm_fuzz::decode;
 use std::fs;
 use std::io::Write;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::time::Instant;
 
 fn main() {
diff --git a/fuel-vm/fuzz/src/execute.rs b/fuel-vm/fuzz/src/bin/execute.rs
similarity index 59%
rename from fuel-vm/fuzz/src/execute.rs
rename to fuel-vm/fuzz/src/bin/execute.rs
index 73800e6b16..2863714d03 100644
--- a/fuel-vm/fuzz/src/execute.rs
+++ b/fuel-vm/fuzz/src/bin/execute.rs
@@ -1,18 +1,6 @@
-use fuel_vm::consts::WORD_SIZE;
-use fuel_vm::fuel_asm::op;
-use fuel_vm::fuel_asm::RegId;
-use fuel_vm::fuel_asm::{Instruction, RawInstruction};
-use fuel_vm::fuel_crypto::rand::Rng;
-use fuel_vm::fuel_crypto::rand::SeedableRng;
-use fuel_vm::fuel_types::Word;
-use fuel_vm::prelude::SecretKey;
 use fuel_vm_fuzz::execute;
-use fuel_vm_fuzz::FuzzData;
-use fuel_vm_fuzz::{decode, decode_instructions, encode};
-use std::convert::TryFrom;
-use std::convert::TryInto;
-use std::fs;
-use std::path::{Path, PathBuf};
+use fuel_vm_fuzz::decode;
+use std::path::Path;
 
 fn main() {
     let path = std::env::args().nth(1).expect("no path given");
@@ -27,7 +15,7 @@ fn main() {
             println!("{:?}:{}", path, result.success);
         }
     } else {
-        let paths = fs::read_dir(path).unwrap();
+        let paths = std::fs::read_dir(path).unwrap();
 
         for path in paths {
             let entry = path.unwrap();
diff --git a/fuel-vm/fuzz/src/seed.rs b/fuel-vm/fuzz/src/bin/seed.rs
similarity index 73%
rename from fuel-vm/fuzz/src/seed.rs
rename to fuel-vm/fuzz/src/bin/seed.rs
index 537e33f7de..e27ddc8818 100644
--- a/fuel-vm/fuzz/src/seed.rs
+++ b/fuel-vm/fuzz/src/bin/seed.rs
@@ -1,15 +1,7 @@
 //! See README.md for usage example
 
-use fuel_vm::consts::WORD_SIZE;
-use fuel_vm::fuel_asm::{Instruction, RawInstruction};
-use fuel_vm::fuel_crypto::rand::Rng;
-use fuel_vm::fuel_crypto::rand::SeedableRng;
-use fuel_vm::fuel_types::Word;
-use fuel_vm::prelude::SecretKey;
 use fuel_vm_fuzz::FuzzData;
-use fuel_vm_fuzz::{decode, decode_instructions, encode};
-use std::convert::TryFrom;
-use std::convert::TryInto;
+use fuel_vm_fuzz::{decode, encode};
 use std::fs;
 use std::path::PathBuf;
 
diff --git a/fuel-vm/fuzz/src/lib.rs b/fuel-vm/fuzz/src/lib.rs
index 224224dd63..2421a3b955 100644
--- a/fuel-vm/fuzz/src/lib.rs
+++ b/fuel-vm/fuzz/src/lib.rs
@@ -7,7 +7,6 @@ use fuel_vm::prelude::*;
 use fuel_vm::util::test_helpers::TestBuilder;
 use fuel_vm::{fuel_asm, script_with_data_offset};
 use fuel_vm::fuel_types::canonical::Serialize;
-use std::io::Read;
 use std::ops::Range;
 
 /// Magic value used as separator between fuzz data components in corpus files.