Tweak the way node RPC url is configured

Author: bbedward

config.py

@@ -29,8 +29,7 @@ def instance(cls) -> 'Config':
             parser.add_argument('-p', '--prefix', type=str, help='Command prefix for bot commands', default='!')
             parser.add_argument('-l', '--log-file', type=str, help='Log file location', default='/tmp/graham_bot.log')
             parser.add_argument('-s', '--status', type=str, help="The bot's 'playing status'", default=None, required=False)
-            parser.add_argument('-u', '--node-url', type=str, help='URL of the node', default='[::1]')
-            parser.add_argument('-np', '--node-port', type=int, help='Port of the node', default=7072 if Env.banano() else 7076)
+            parser.add_argument('-u', '--node-url', type=str, help='URL of the node, e.g.: http://[::1]:7072', default='http://[::1]:7072' if Env.banano() else 'http://[::1]:7076')
             parser.add_argument('--debug', action='store_true', help='Runs in debug mode if specified', default=False)
             options, unknown = parser.parse_known_args()
 
@@ -53,7 +52,6 @@ def instance(cls) -> 'Config':
                 exit(1)
 
             cls.node_url = options.node_url
-            cls.node_port = options.node_port
         return cls._instance
 
     def has_yaml(self) -> bool:

rpc/client.py

@@ -14,11 +14,9 @@ def __init__(self):
     def instance(cls) -> 'RPCClient':
         if cls._instance is None:
             cls._instance = cls.__new__(cls)
-            cls.node_url = Config.instance().node_url
-            cls.node_port = Config.instance().node_port
             cls.wallet_id = Config.instance().wallet
-            cls.ipv6 = '::' in cls.node_url
-            cls.connector = aiohttp.TCPConnector(family=socket.AF_INET6 if cls.ipv6 else socket.AF_INET,resolver=aiohttp.AsyncResolver())
+            cls.node_url = Config.instance().node_url
+            cls.connector = aiohttp.TCPConnector(family=0 ,resolver=aiohttp.AsyncResolver())
             cls.session = aiohttp.ClientSession(connector=cls.connector, json_serialize=json.dumps)
         return cls._instance
 
@@ -30,7 +28,7 @@ async def close(cls):
             cls._instance = None
 
     async def make_request(self, req_json: dict):
-        async with self.session.post("http://{0}:{1}".format(self.node_url, self.node_port),json=req_json, timeout=300) as resp:
+        async with self.session.post(self.node_url ,json=req_json, timeout=300) as resp:
             return await resp.json()
 
     async def account_create(self) -> str: