fix: resolve anvil executable on Windows

Author: BobTheBuidler

brownie/network/rpc/anvil.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 
+import shutil
 import sys
 import warnings
 from subprocess import DEVNULL, PIPE
@@ -34,12 +35,15 @@ def launch(cmd: str, **kwargs: Any) -> None:
 
     Args:
         cmd: command string to execute as subprocess"""
-    if sys.platform == "win32" and not cmd.split(" ")[0].endswith(".cmd"):
-        if " " in cmd:
-            cmd = cmd.replace(" ", ".cmd ", 1)
-        else:
-            cmd += ".cmd"
     cmd_list = cmd.split(" ")
+    if sys.platform == "win32":
+        executable = cmd_list[0]
+        resolved = shutil.which(executable)
+        if resolved is not None:
+            cmd_list[0] = resolved
+        elif not executable.endswith(".cmd"):
+            cmd_list[0] = f"{executable}.cmd"
+
     cmd_list.append("--quiet")
     for key, value in kwargs.items():
         if value is None or value is False:

tests/network/rpc/test_anvil.py

@@ -30,7 +30,7 @@ def test_anvil_launcher_keeps_falsy_command_values(popen_calls):
         steps_tracing=True,
     )
 
-    cmd_list, _ = calls.pop()
+    cmd_list, _ = popen_calls.pop()
 
     assert cmd_list == [
         "anvil",
@@ -45,6 +45,32 @@ def test_anvil_launcher_keeps_falsy_command_values(popen_calls):
     assert "--block-time" not in cmd_list
 
 
+def test_anvil_launcher_uses_resolved_windows_executable(monkeypatch, popen_calls):
+    monkeypatch.setattr(anvil.sys, "platform", "win32")
+    monkeypatch.setattr(
+        anvil.shutil,
+        "which",
+        lambda executable: r"C:\Users\runner\.foundry\bin\anvil.exe"
+        if executable == "anvil"
+        else None,
+    )
+
+    anvil.launch("anvil")
+
+    cmd_list, _ = popen_calls.pop()
+    assert cmd_list[0] == r"C:\Users\runner\.foundry\bin\anvil.exe"
+
+
+def test_anvil_launcher_falls_back_to_cmd_on_windows(monkeypatch, popen_calls):
+    monkeypatch.setattr(anvil.sys, "platform", "win32")
+    monkeypatch.setattr(anvil.shutil, "which", lambda _: None)
+
+    anvil.launch("anvil")
+
+    cmd_list, _ = popen_calls.pop()
+    assert cmd_list[0] == "anvil.cmd"
+
+
 def test_anvil_launcher_does_not_set_default_balance(popen_calls):
     anvil.launch("anvil")