[tests] Remove getinfo fixups

jnewbery · jnewbery · commit 10da6dfc8615 · 2017-09-05T13:11:48.000-04:00
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
@@ -613,8 +613,7 @@ A few guidelines for introducing and reviewing new RPC interfaces:
     from there.
 
 - A RPC method must either be a wallet method or a non-wallet method. Do not
-  introduce new methods such as `getinfo` and `signrawtransaction` that differ
-  in behavior based on presence of a wallet.
+  introduce new methods that differ in behavior based on presence of a wallet.
 
   - *Rationale*: as well as complicating the implementation and interfering
     with the introduction of multi-wallet, wallet and non-wallet code should be
diff --git a/test/functional/bitcoin_cli.py b/test/functional/bitcoin_cli.py
@@ -14,19 +14,18 @@ def __init__(self):
         self.num_nodes = 1
 
     def run_test(self):
-        """Main test logic"""
 
         self.log.info("Compare responses from gewallettinfo RPC and `bitcoin-cli getwalletinfo`")
-        cli_get_info = self.nodes[0].cli.getwalletinfo()
-        rpc_get_info = self.nodes[0].getwalletinfo()
-
-        assert_equal(cli_get_info, rpc_get_info)
+        assert_equal(self.nodes[0].cli.getwalletinfo(), self.nodes[0].getwalletinfo())
 
         self.log.info("Compare responses from getblockchaininfo RPC and `bitcoin-cli getblockchaininfo`")
-        cli_get_info = self.nodes[0].cli.getblockchaininfo()
-        rpc_get_info = self.nodes[0].getblockchaininfo()
+        assert_equal(self.nodes[0].cli.getblockchaininfo(), self.nodes[0].getblockchaininfo())
+
+        self.log.info("Compare responses from getmininginfo RPC and `bitcoin-cli getmininginfo`")
+        assert_equal(self.nodes[0].cli.getmininginfo(), self.nodes[0].getmininginfo())
 
-        assert_equal(cli_get_info, rpc_get_info)
+        self.log.info("Compare responses from getnetworkinfo RPC and `bitcoin-cli getnetworkinfo`")
+        assert_equal(self.nodes[0].cli.getnetworkinfo(), self.nodes[0].getnetworkinfo())
 
 if __name__ == '__main__':
     TestBitcoinCli().main()
