From 4d2a0d4afc26f867adbc02476a0eae0942dbd9d7 Mon Sep 17 00:00:00 2001
From: Keri <kclowes@users.noreply.github.com>
Date: Mon, 11 Nov 2019 14:11:15 -0700
Subject: [PATCH] Cleanup

---
 tests/core/method-class/test_method.py | 21 ++++++++++-----------
 web3/method.py                         |  2 --
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/tests/core/method-class/test_method.py b/tests/core/method-class/test_method.py
index 3b72ca16b5..6bd4bbd3a4 100644
--- a/tests/core/method-class/test_method.py
+++ b/tests/core/method-class/test_method.py
@@ -107,7 +107,7 @@ def test_default_input_munger_with_input_parameters_exception():
 
 
 @pytest.mark.parametrize(
-    "method_config,args,kwargs,expected_req_result,expected_result_formatters_len",
+    "method_config,args,kwargs,expected_request_result,expected_result_formatters_len",
     (
         (
             {
@@ -224,17 +224,17 @@ def test_process_params(
         method_config,
         args,
         kwargs,
-        expected_req_result,
+        expected_request_result,
         expected_result_formatters_len):
 
-    if isclass(expected_req_result) and issubclass(expected_req_result, Exception):
-        with pytest.raises(expected_req_result):
+    if isclass(expected_request_result) and issubclass(expected_request_result, Exception):
+        with pytest.raises(expected_request_result):
             method = Method(**method_config)
-            req_params, output_formatter = method.process_params(object(), *args, **kwargs)
+            request_params, output_formatter = method.process_params(object(), *args, **kwargs)
     else:
         method = Method(**method_config)
-        req_params, output_formatter = method.process_params(object(), *args, **kwargs)
-        assert req_params == expected_req_result
+        request_params, output_formatter = method.process_params(object(), *args, **kwargs)
+        assert request_params == expected_request_result
         first_formatter = (output_formatter[0].first,)
         all_other_formatters = output_formatter[0].funcs
         assert len(first_formatter + all_other_formatters) == expected_result_formatters_len
@@ -256,7 +256,7 @@ def formatter(params):
 
 class FakeModule(ModuleV2):
     method = Method(
-        'eth_getBalance',
+        'eth_method',
         mungers=[keywords],
         request_formatters=return_exception_raising_formatter)
 
@@ -275,8 +275,7 @@ def test_munger_class_method_access_raises_friendly_error():
 
 
 def test_munger_arguments_by_keyword(dummy_w3):
-    addr = '0x' + '00' * 20
     with pytest.raises(Success):
-        dummy_w3.fake.method(addr, keyword_two='latest')
+        dummy_w3.fake.method(keyword_one=1, keyword_two='latest')
     with pytest.raises(Success):
-        dummy_w3.fake.method(addr, 'latest')
+        dummy_w3.fake.method(1, keyword_two=2)
diff --git a/web3/method.py b/web3/method.py
index 5823bb6d99..c71aaf5311 100644
--- a/web3/method.py
+++ b/web3/method.py
@@ -91,8 +91,6 @@ def __init__(
 
         self.json_rpc_method = json_rpc_method
         self.mungers = mungers or [default_munger]
-        # TODO - decide if this request_formatters
-        # (and result_formatters) is worth keeping for testing
         self.request_formatters = request_formatters or get_request_formatters
         self.result_formatters = result_formatters or get_result_formatters
         self.error_formatters = get_error_formatters