From 1f40076a451fc3bc85e6ccd434b4edd890ddb176 Mon Sep 17 00:00:00 2001
From: reverendus <reverendus@invalid>
Date: Sat, 16 Dec 2017 10:40:20 +0100
Subject: [PATCH] `pymaker` upgraded, not using `pymaker.Logger` anymore

---
 .gitignore                 |  2 --
 bite_keeper/bite_keeper.py | 17 +++++------------
 lib/pymaker                |  2 +-
 logs/.keep                 |  0
 4 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 logs/.keep

diff --git a/.gitignore b/.gitignore
index bcc0371..02cb95e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,3 @@ __pycache__
 .coverage
 
 .DS_Store
-
-logs/*.json.log
diff --git a/bite_keeper/bite_keeper.py b/bite_keeper/bite_keeper.py
index bc36950..adf9138 100755
--- a/bite_keeper/bite_keeper.py
+++ b/bite_keeper/bite_keeper.py
@@ -16,18 +16,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
-import os
+import logging
 import sys
 
-import pkg_resources
 from web3 import Web3, HTTPProvider
 
-from pymaker import Address, Contract
+from pymaker import Address
 from pymaker.gas import FixedGasPrice, DefaultGasPrice
 from pymaker.lifecycle import Web3Lifecycle
-from pymaker.logger import Logger
 from pymaker.sai import Tub
-from pymaker.util import chain
 
 
 class BiteKeeper:
@@ -41,22 +38,18 @@ def __init__(self, args: list, **kwargs):
         parser.add_argument("--tub-address", help="Ethereum address of the Tub contract", required=True, type=str)
         parser.add_argument("--gas-price", help="Gas price in Wei (default: node default)", type=int)
         parser.add_argument("--debug", help="Enable debug output", dest='debug', action='store_true')
-        parser.add_argument("--trace", help="Enable trace output", dest='trace', action='store_true')
         self.arguments = parser.parse_args(args)
 
         self.web3 = kwargs['web3'] if 'web3' in kwargs else Web3(HTTPProvider(endpoint_uri=f"http://{self.arguments.rpc_host}:{self.arguments.rpc_port}"))
         self.web3.eth.defaultAccount = self.arguments.eth_from
-
-        self.chain = chain(self.web3)
         self.our_address = Address(self.arguments.eth_from)
         self.tub = Tub(web3=self.web3, address=Address(self.arguments.tub_address))
 
-        _json_log = os.path.abspath(pkg_resources.resource_filename(__name__, f"../logs/bite-keeper_{self.chain}_{self.our_address}.json.log".lower()))
-        self.logger = Logger('bite-keeper', self.chain, _json_log, self.arguments.debug, self.arguments.trace)
-        Contract.logger = self.logger
+        logging.basicConfig(format='%(asctime)-15s %(levelname)-8s %(message)s',
+                            level=(logging.DEBUG if self.arguments.debug else logging.INFO))
 
     def main(self):
-        with Web3Lifecycle(self.web3, self.logger) as lifecycle:
+        with Web3Lifecycle(self.web3) as lifecycle:
             lifecycle.on_block(self.check_all_cups)
 
     def check_all_cups(self):
diff --git a/lib/pymaker b/lib/pymaker
index b70841a..696f900 160000
--- a/lib/pymaker
+++ b/lib/pymaker
@@ -1 +1 @@
-Subproject commit b70841a4e27e71233fd0921553e4503e9e3cf35d
+Subproject commit 696f9009a541bae9e26b130893afd44b3e66e587
diff --git a/logs/.keep b/logs/.keep
deleted file mode 100644
index e69de29..0000000