From 0fc922db3939dba12e3a915601e73f2208d25841 Mon Sep 17 00:00:00 2001
From: Ben Hauser <ben@hauser.id>
Date: Mon, 20 Jul 2020 01:02:20 +0300
Subject: [PATCH] fix: move tx silent logic into account

---
 brownie/network/account.py     | 8 ++++++--
 brownie/network/transaction.py | 9 ++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/brownie/network/account.py b/brownie/network/account.py
index 437158dd6..ff41c5ba0 100644
--- a/brownie/network/account.py
+++ b/brownie/network/account.py
@@ -351,7 +351,7 @@ def deploy(
         gas_price: Optional[int] = None,
         nonce: Optional[int] = None,
         required_confs: int = 1,
-        silent: bool = False,
+        silent: bool = None,
     ) -> Any:
         """Deploys a contract.
 
@@ -377,6 +377,8 @@ def deploy(
                 f"Local RPC using '{rpc.evm_version()}' but contract was compiled for '{evm}'"
             )
         data = contract.deploy.encode_input(*args)
+        if silent is None:
+            silent = bool(CONFIG.mode == "test" or CONFIG.argv["silent"])
         with self._lock:
             try:
                 txid = self._transact(  # type: ignore
@@ -471,7 +473,7 @@ def transfer(
         data: str = None,
         nonce: Optional[int] = None,
         required_confs: int = 1,
-        silent: bool = False,
+        silent: bool = None,
     ) -> TransactionReceipt:
         """
         Broadcast a transaction from this account.
@@ -488,6 +490,8 @@ def transfer(
         Returns:
             TransactionReceipt object
         """
+        if silent is None:
+            silent = bool(CONFIG.mode == "test" or CONFIG.argv["silent"])
         with self._lock:
             tx = {
                 "from": self.address,
diff --git a/brownie/network/transaction.py b/brownie/network/transaction.py
index 975fb55ea..e66b9afea 100644
--- a/brownie/network/transaction.py
+++ b/brownie/network/transaction.py
@@ -111,7 +111,7 @@ def __init__(
         self,
         txid: Union[str, bytes],
         sender: Any = None,
-        silent: bool = None,
+        silent: bool = True,
         required_confs: int = 1,
         name: str = "",
         revert_data: Optional[Tuple] = None,
@@ -126,12 +126,7 @@ def __init__(
             name: contract function being called
             revert_data: (revert string, program counter, revert type)
         """
-        if silent is None and (CONFIG.mode == "test" or CONFIG.argv["silent"]):
-            self._silent = True
-        else:
-            if silent is None:
-                silent = True
-            self._silent = silent
+        self._silent = silent
 
         if isinstance(txid, bytes):
             txid = HexBytes(txid).hex()