additional-libs instead of opt

Author: BlaineHeffron

cmd/soroban-cli/src/commands/contract/build.rs

@@ -236,13 +236,13 @@ impl Cmd {
             target_file_path.clone()
         };
 
-        #[cfg(feature = "opt")]
+        #[cfg(feature = "additional-libs")]
         let mut optimized_path = None;
-        #[cfg(not(feature = "opt"))]
+        #[cfg(not(feature = "additional-libs"))]
         let optimized_path = None;
 
         if self.optimize {
-            #[cfg(feature = "opt")]
+            #[cfg(feature = "additional-libs")]
             {
                 use crate::wasm::Args as WasmArgs;
                 let optimized_file_path = final_path.with_extension("optimized.wasm");
@@ -252,7 +252,7 @@ impl Cmd {
                 wasm_args.optimize(&optimized_file_path)?;
                 optimized_path = Some(optimized_file_path);
             }
-            #[cfg(not(feature = "opt"))]
+            #[cfg(not(feature = "additional-libs"))]
             {
                 print.warnln(
                 "Must install with \"opt\" feature (e.g. `cargo install --locked soroban-cli --features opt`) to use --optimize",

cmd/soroban-cli/src/commands/contract/optimize.rs

@@ -1,7 +1,5 @@
 use clap::{arg, command, Parser};
 use std::fmt::Debug;
-#[cfg(feature = "additional-libs")]
-use wasm_opt::{Feature, OptimizationError, OptimizationOptions};
 
 use crate::wasm;
 
@@ -19,9 +17,6 @@ pub struct Cmd {
 pub enum Error {
     #[error(transparent)]
     Wasm(#[from] wasm::Error),
-    #[cfg(feature = "additional-libs")]
-    #[error("optimization error: {0}")]
-    OptimizationError(OptimizationError),
     #[cfg(not(feature = "additional-libs"))]
     #[error("must install with \"additional-libs\" feature.")]
     Install,

cmd/soroban-cli/src/wasm.rs

@@ -50,7 +50,7 @@ pub enum Error {
     ContractIsStellarAsset,
     #[error(transparent)]
     Network(#[from] NetworkError),
-    #[cfg(feature = "opt")]
+    #[cfg(feature = "additional-libs")]
     #[error("optimization error: {0}")]
     OptimizationError(#[from] wasm_opt::OptimizationError),
 }
@@ -96,7 +96,7 @@ impl Args {
         Ok(Hash(Sha256::digest(self.read()?).into()))
     }
 
-    #[cfg(feature = "opt")]
+    #[cfg(feature = "additional-libs")]
     /// Optimizes the wasm file in place or outputs to another file.
     pub fn optimize(&self, output: &Path) -> Result<(), Error> {
         use wasm_opt::{Feature, OptimizationOptions};