smaller fixes based on PR's comments

NomicFoundation · Apr 8, 2024 · 2f1dafe · 2f1dafe
1 parent d466a56
commit 2f1dafe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packages/hardhat-vyper/src/compiler.ts b/packages/hardhat-vyper/src/compiler.ts
@@ -58,16 +58,16 @@ function getOptimize(
   compilerVersion: string,
   optimize: string | boolean | undefined
 ): string {
-  if (compilerVersion === "" && optimize !== undefined) {
+  if (optimize === undefined) {
+    return "";
+  }
+
+  if (compilerVersion === "") {
     throw new VyperPluginError(
       "The 'compilerVersion' parameter must be set when the setting 'optimize' is set."
     );
   }
 
-  if (optimize === undefined) {
-    return "";
-  }
-
   if (typeof optimize === "boolean") {
     if (optimize) {
       if (
@@ -105,6 +105,6 @@ function getOptimize(
   }
 
   throw new VyperPluginError(
-    `The 'optimize' setting has an invalid type value. Type is: ${typeof optimize}.`
+    `The 'optimize' setting has an invalid type value: ${typeof optimize}. Type should be either string or boolean.`
   );
 }
diff --git a/packages/hardhat-vyper/test/tests.ts b/packages/hardhat-vyper/test/tests.ts
@@ -159,7 +159,7 @@ describe("Vyper plugin", function () {
       it("should fail the compilation", async function () {
         await expect(this.env.run(TASK_COMPILE)).to.be.rejectedWith(
           Error,
-          "The 'optimize' setting has an invalid type value. Type is: number."
+          "The 'optimize' setting has an invalid type value: number. Type should be either string or boolean."
         );
       });
     });