From 16f612acf493025bcec5d3139804c3afc14ffe39 Mon Sep 17 00:00:00 2001 From: Ayush Shukla Date: Mon, 16 Aug 2021 16:48:11 +0530 Subject: [PATCH 1/2] fix: recursively kill all rpc child processes --- CHANGELOG.md | 2 ++ brownie/network/rpc/__init__.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea3283f9e..909a72877 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ This changelog format is based on [Keep a Changelog](https://keepachangelog.com/ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased](https://github.com/eth-brownie/brownie) +### Fixed +- Recursively kill all RPC child processes on exit ([#1200](https://github.com/eth-brownie/brownie/pull/1200)) ## [1.16.0](https://github.com/eth-brownie/brownie/tree/v1.16.0) - 2021-08-08 ### Added diff --git a/brownie/network/rpc/__init__.py b/brownie/network/rpc/__init__.py index 9b9bbffa7..e9750955f 100644 --- a/brownie/network/rpc/__init__.py +++ b/brownie/network/rpc/__init__.py @@ -138,7 +138,7 @@ def kill(self, exc: bool = True) -> None: print("Terminating local RPC client...") except ValueError: pass - for child in self.process.children(): + for child in self.process.children(recursive=True): try: child.kill() except psutil.NoSuchProcess: From e5c58aa6cfc7b490565a86e471d76fcd1a3cbfe2 Mon Sep 17 00:00:00 2001 From: Ayush Shukla Date: Mon, 16 Aug 2021 16:49:25 +0530 Subject: [PATCH 2/2] fix: use 120s timeout for hardhat-fork network --- brownie/data/network-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/brownie/data/network-config.yaml b/brownie/data/network-config.yaml index 3c730ca75..1cbe14fcb 100644 --- a/brownie/data/network-config.yaml +++ b/brownie/data/network-config.yaml @@ -121,6 +121,7 @@ development: id: hardhat-fork cmd: npx hardhat node host: http://127.0.0.1 + timeout: 120 cmd_settings: port: 8545 fork: mainnet