Fix tests

tests/test_arcparam.py

@@ -7,26 +7,13 @@ from pytchat.parser.live import Parser
 
 def test_arcparam_0(mocker):
     param = arcparam.getparam("01234567890", -1)
-    assert param == "op2w0wQmGhxDZzhLRFFvTE1ERXlNelExTmpjNE9UQWdBUT09SARgAXICCAE%3D" 
+    assert param == "op2w0wSDARpsQ2pnYURRb0xNREV5TXpRMU5qYzRPVEFxSndvWVgxOWZYMTlmWDE5ZlgxOWZYMTlmWDE5ZlgxOWZYMTlmRWdzd01USXpORFUyTnpnNU1Cb1Q2cWpkdVFFTkNnc3dNVEl6TkRVMk56ZzVNQ0FCKOgHMAA4AEAASARSAiAAcgIIAXgA" 
 
 
 def test_arcparam_1(mocker):
     param = arcparam.getparam("01234567890", seektime=100000)
-    assert param == "op2w0wQtGhxDZzhLRFFvTE1ERXlNelExTmpjNE9UQWdBUT09KIDQ28P0AkgDYAFyAggB"
+    assert param == "op2w0wSHARpsQ2pnYURRb0xNREV5TXpRMU5qYzRPVEFxSndvWVgxOWZYMTlmWDE5ZlgxOWZYMTlmWDE5ZlgxOWZYMTlmRWdzd01USXpORFUyTnpnNU1Cb1Q2cWpkdVFFTkNnc3dNVEl6TkRVMk56ZzVNQ0FCKIDQ28P0AjAAOABAAEgDUgIgAHICCAF4AA%3D%3D"
-
-
-def test_arcparam_2(mocker):
-    param = arcparam.getparam("SsjCnHOk-Sk", seektime=100)
-    url = f"https://www.youtube.com/live_chat_replay/get_live_chat_replay?continuation={param}&pbj=1"
-    resp = httpx.Client(http2=True).get(url, headers=config.headers)
-    jsn = json.loads(resp.text)
-    parser = Parser(is_replay=True)
-    contents = parser.get_contents(jsn)
-    _, chatdata = parser.parse(contents)
-    test_id = chatdata[0]["addChatItemAction"]["item"]["liveChatTextMessageRenderer"]["id"]
-    assert test_id == "CjoKGkNMYXBzZTdudHVVQ0Zjc0IxZ0FkTnFnQjVREhxDSnlBNHV2bnR1VUNGV0dnd2dvZDd3NE5aZy0w"
-
 
 def test_arcparam_3(mocker):
     param = arcparam.getparam("01234567890")
-    assert param == "op2w0wQmGhxDZzhLRFFvTE1ERXlNelExTmpjNE9UQWdBUT09SARgAXICCAE%3D"
+    assert param == "op2w0wSDARpsQ2pnYURRb0xNREV5TXpRMU5qYzRPVEFxSndvWVgxOWZYMTlmWDE5ZlgxOWZYMTlmWDE5ZlgxOWZYMTlmRWdzd01USXpORFUyTnpnNU1Cb1Q2cWpkdVFFTkNnc3dNVEl6TkRVMk56ZzVNQ0FCKOgHMAA4AEAASARSAiAAcgIIAXgA"

tests/test_calculator_parse.py

@@ -6,50 +6,55 @@ parse = SuperchatCalculator()._parse
 
 
 def _open_file(path):
-    with open(path,mode ='r',encoding = 'utf-8') as f:
+    with open(path, mode='r', encoding='utf-8') as f:
         return f.read()
 
+
 def load_chatdata(filepath):
     parser = Parser(is_replay=True)
-    #print(json.loads(_open_file(filepath)))
+    # print(json.loads(_open_file(filepath)))
-    contents = parser.get_contents( json.loads(_open_file(filepath)))
+    contents = parser.get_contents(json.loads(_open_file(filepath)))[0]
     return parser.parse(contents)[1]
 
 
-
 def test_parse_1():
-    renderer ={"purchaseAmountText":{"simpleText":"￥2,000"}}
+    renderer = {"purchaseAmountText": {"simpleText": "￥2,000"}}
-    symbol ,amount = parse(renderer)
+    symbol, amount = parse(renderer)
     assert symbol == '￥'
     assert amount == 2000.0
 
+
 def test_parse_2():
-    renderer ={"purchaseAmountText":{"simpleText":"ABC\x0a200"}}
+    renderer = {"purchaseAmountText": {"simpleText": "ABC\x0a200"}}
-    symbol ,amount = parse(renderer)
+    symbol, amount = parse(renderer)
     assert symbol == 'ABC\x0a'
     assert amount == 200.0
 
+
 def test_process_0():
     """
     parse superchat data
     """
     chat_component = {
-        'video_id':'',
+        'video_id': '',
-        'timeout':10,
+        'timeout': 10,
-        'chatdata':load_chatdata(r"tests/testdata/calculator/superchat_0.json")
+        'chatdata': load_chatdata(r"tests/testdata/calculator/superchat_0.json")
     }
-    assert SuperchatCalculator().process([chat_component])=={'￥': 6800.0, '€': 2.0}
+    assert SuperchatCalculator().process([chat_component]) == {
+        '￥': 6800.0, '€': 2.0}
+
 
 def test_process_1():
     """
     parse no superchat data
     """
     chat_component = {
-        'video_id':'',
+        'video_id': '',
-        'timeout':10,
+        'timeout': 10,
-        'chatdata':load_chatdata(r"tests/testdata/calculator/text_only.json")
+        'chatdata': load_chatdata(r"tests/testdata/calculator/text_only.json")
     }
-    assert SuperchatCalculator().process([chat_component])=={}
+    assert SuperchatCalculator().process([chat_component]) == {}
+
 
 def test_process_2():
     """
@@ -57,12 +62,11 @@ def test_process_2():
     """
     try:
         chat_component = {
-            'video_id':'',
+            'video_id': '',
-            'timeout':10,
+            'timeout': 10,
-            'chatdata':load_chatdata(r"tests/testdata/calculator/replay_end.json")
+            'chatdata': load_chatdata(r"tests/testdata/calculator/replay_end.json")
         }
         assert False
         SuperchatCalculator().process([chat_component])
     except ChatParseException:
         assert True
-    

tests/test_compatible_processor.py

@@ -11,7 +11,7 @@ def test_textmessage(mocker):
 
     _json = _open_file("tests/testdata/compatible/textmessage.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,
@@ -51,7 +51,7 @@ def test_newsponcer(mocker):
 
     _json = _open_file("tests/testdata/compatible/newSponsor.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,
@@ -88,7 +88,7 @@ def test_newsponcer_rev(mocker):
 
     _json = _open_file("tests/testdata/compatible/newSponsor_rev.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,
@@ -125,7 +125,7 @@ def test_superchat(mocker):
 
     _json = _open_file("tests/testdata/compatible/superchat.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,
@@ -164,7 +164,7 @@ def test_unregistered_currency(mocker):
 
     _json = _open_file("tests/testdata/unregistered_currency.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
 
     data = {
         "video_id": "",

tests/test_default_processor.py

@@ -18,7 +18,7 @@ def test_textmessage(mocker):
     parser = Parser(is_replay=False)
     _json = _open_file("tests/testdata/default/textmessage.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,
@@ -47,7 +47,7 @@ def test_textmessage_replay_member(mocker):
     parser = Parser(is_replay=True)
     _json = _open_file("tests/testdata/default/replay_member_text.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,
@@ -79,7 +79,7 @@ def test_superchat(mocker):
     parser = Parser(is_replay=False)
     _json = _open_file("tests/testdata/default/superchat.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,
@@ -121,7 +121,7 @@ def test_supersticker(mocker):
     parser = Parser(is_replay=False)
     _json = _open_file("tests/testdata/default/supersticker.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,
@@ -162,7 +162,7 @@ def test_sponsor(mocker):
     parser = Parser(is_replay=False)
     _json = _open_file("tests/testdata/default/newSponsor_current.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,
@@ -195,7 +195,7 @@ def test_sponsor_legacy(mocker):
     parser = Parser(is_replay=False)
     _json = _open_file("tests/testdata/default/newSponsor_lagacy.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 7,

tests/test_extract_patch.py

@@ -208,7 +208,7 @@ def test_split_none():
      
      @fetched patch
                             |-- patch --|
-                                      patch.last < parent_block.last                       .
+                                      patch.last < parent_block.last.
      
                             |
                             |

tests/test_extract_video_id.py

@@ -1,4 +1,4 @@
-from pytchat.util.extract_video_id import extract_video_id
+from pytchat.util import extract_video_id
 from pytchat.exceptions import InvalidVideoIdException
 
 VALID_TEST_PATTERNS = (

tests/test_liveparam.py

@@ -5,5 +5,5 @@ def test_liveparam_0(mocker):
     _ts1= 1546268400
     param = liveparam._build("01234567890",
     *([_ts1*1000000 for i in range(5)]), topchat_only=False)
-    test_param="0ofMyANcGhxDZzhLRFFvTE1ERXlNelExTmpjNE9UQWdBUT09KIC41tWqyt8CQAFKC1CAuNbVqsrfAlgDUIC41tWqyt8CWIC41tWqyt8CaAGCAQIIAZoBAKABgLjW1arK3wI%3D"
+    test_param="0ofMyAN1GhxDZzhLRFFvTE1ERXlNelExTmpjNE9UQWdBUT09KIC41tWqyt8CMAA4AEABShsIABAAGAAgADoAQABKAFCAuNbVqsrfAlgDeABQgLjW1arK3wJYgLjW1arK3wJoAYIBAggBiAEAmgECCACgAYC41tWqyt8C"
     assert test_param == param

tests/test_parser.py

@@ -12,29 +12,23 @@ def _open_file(path):
 
 
 def test_finishedlive(*mock):
-    '''配信が終了した動画を正しく処理できるか'''
     _text = _open_file('tests/testdata/finished_live.json')
     _text = json.loads(_text)
 
     try:
-        parser.parse(parser.get_contents(_text))
+        parser.parse(parser.get_contents(_text)[0])
         assert False
     except NoContents:
         assert True
 
 
 def test_parsejson(*mock):
-    '''jsonを正常にパースできるか'''
     _text = _open_file('tests/testdata/paramgen_firstread.json')
     _text = json.loads(_text)
 
     try:
-        parser.parse(parser.get_contents(_text))
+        s, _ = parser.parse(parser.get_contents(_text)[0])
-        jsn = _text
+        assert s['timeoutMs'] == 5035
-        timeout = jsn["response"]["continuationContents"]["liveChatContinuation"]["continuations"][0]["timedContinuationData"]["timeoutMs"]
+        assert s['continuation'] == "0ofMyAPiARp8Q2c4S0RRb0xhelJMZDBsWFQwdERkalFhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5YXpSTGQwbFhUMHREZGpRbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCiPz5-Os-PkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQgJqXjrPj5AJYA1CRwciOs-PkAli3pNq1k-PkAmgBggEECAEQAIgBAKABjbfnjrPj5AI%3D"
-        continuation = jsn["response"]["continuationContents"]["liveChatContinuation"][
-            "continuations"][0]["timedContinuationData"]["continuation"]
-        assert timeout == 5035
-        assert continuation == "0ofMyAPiARp8Q2c4S0RRb0xhelJMZDBsWFQwdERkalFhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5YXpSTGQwbFhUMHREZGpRbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCiPz5-Os-PkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQgJqXjrPj5AJYA1CRwciOs-PkAli3pNq1k-PkAmgBggEECAEQAIgBAKABjbfnjrPj5AI%3D"
     except Exception:
         assert False

tests/test_speed_calculator.py

@@ -15,7 +15,7 @@ def test_speed_1(mocker):
 
     _json = _open_file("tests/testdata/speed/speedtest_normal.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 10,
@@ -32,7 +32,7 @@ def test_speed_2(mocker):
 
     _json = _open_file("tests/testdata/speed/speedtest_undefined.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 10,
@@ -49,7 +49,7 @@ def test_speed_3(mocker):
 
     _json = _open_file("tests/testdata/speed/speedtest_empty.json")
 
-    _, chatdata = parser.parse(parser.get_contents(json.loads(_json)))
+    _, chatdata = parser.parse(parser.get_contents(json.loads(_json))[0])
     data = {
         "video_id": "",
         "timeout": 10,

tests/testdata/calculator/superchat_0.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -3320,5 +3319,4 @@
    ]
   }
  }
- }
 }

tests/testdata/calculator/text_only.json

@@ -1,5 +1,4 @@
 {
- "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -85,5 +84,4 @@
       ]
     }
   }
- }
 }

tests/testdata/chatreplay.json

@@ -15,7 +15,6 @@
       "url": "/live_chat_replay/get_live_chat_replay?continuation=op2w0wRyGjxDZzhhRFFvTFUzTnFRMjVJVDJzdFUyc2FFLXFvM2JrQkRRb0xVM05xUTI1SVQyc3RVMnNnQVElM0QlM0QoATAAOABAAEgEUhwIABAAGAAgACoOc3RhdGljY2hlY2tzdW1AAFgDYAFoAHIECAEQAHgA"
     }
   },
-    "response": {
   "responseContext": {
     "serviceTrackingParams": [
       {
@@ -3096,9 +3095,8 @@
         }
       ]
     }
-        }
   },
   "csn": "CAXIXa-uHZnC4wL5nZ7oBQ",
-    "url": "\/live_chat_replay\/get_live_chat_replay?continuation=op2w0wRyGjxDZzhhRFFvTFUzTnFRMjVJVDJzdFUyc2FFLXFvM2JrQkRRb0xVM05xUTI1SVQyc3RVMnNnQVElM0QlM0QoATAAOABAAEgEUhwIABAAGAAgACoOc3RhdGljY2hlY2tzdW1AAFgDYAFoAHIECAEQAHgA",
+  "url": "/live_chat_replay/get_live_chat_replay?continuation=op2w0wRyGjxDZzhhRFFvTFUzTnFRMjVJVDJzdFUyc2FFLXFvM2JrQkRRb0xVM05xUTI1SVQyc3RVMnNnQVElM0QlM0QoATAAOABAAEgEUhwIABAAGAAgACoOc3RhdGljY2hlY2tzdW1AAFgDYAFoAHIECAEQAHgA",
   "xsrf_token": "QUFFLUhqbTZWWEFiT3ZxaDAtY09pRzZXSUotZC1uclFMQXxBQ3Jtc0tsOFZYN09CWFlBd2NKSFB4R3hmN3dUY2xXaW9tbzdFZlZBTllDcnBhMG9WUXVkZGZ5RGRIYkxSajBiNVpsNU5PV3hNYkhUZGJybTVEYWM2MWREbTRUYnc3XzRpeUJVbFpNR0dod1RPbGtVLWJhdkhtUVpVN0JKVGNSQVRSY0ZsODhodEwxaWdjN0pHZThlbEJVXzJMc2VXZGtQOXc="
 }

tests/testdata/compatible/newSponsor.json

@@ -4,7 +4,7 @@
       "st": 100
     }
   },
-    "response": {
+
   "responseContext": {
     "serviceTrackingParams": [
       {
@@ -1838,9 +1838,8 @@
       }
     }
   },
-        "trackingParams": "CAAQ0b4BIhMI1LbVw_aa5QIV2cxMAh2AtAj8"
+  "trackingParams": "CAAQ0b4BIhMI1LbVw_aa5QIV2cxMAh2AtAj8",
-    },
+  "url": "/live_chat/get_live_chat?continuation=0ofMyAOBAhrKAUNrd1NJUW9ZVlVOdVVsRlpTRlJ1VWt4VFJqQmpURXAzVFc1bFpFTm5FZ1V2YkdsMlpTb25DaGhWUTI1U1VWbElWRzVTVEZOR01HTk1TbmROYm1Wa1EyY1NDMDFETTNkVlNpMUNXRTVGR2tPcXVjRzlBVDBLTzJoMGRIQnpPaTh2ZDNkM0xubHZkWFIxWW1VdVkyOXRMMnhwZG1WZlkyaGhkRDkyUFUxRE0zZFZTaTFDV0U1RkptbHpYM0J2Y0c5MWREMHhJQUklM0QwAUopCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoAUPOaw8P2muUCWANoAYIBAggB",
-    "url": "\/live_chat\/get_live_chat?continuation=0ofMyAOBAhrKAUNrd1NJUW9ZVlVOdVVsRlpTRlJ1VWt4VFJqQmpURXAzVFc1bFpFTm5FZ1V2YkdsMlpTb25DaGhWUTI1U1VWbElWRzVTVEZOR01HTk1TbmROYm1Wa1EyY1NDMDFETTNkVlNpMUNXRTVGR2tPcXVjRzlBVDBLTzJoMGRIQnpPaTh2ZDNkM0xubHZkWFIxWW1VdVkyOXRMMnhwZG1WZlkyaGhkRDkyUFUxRE0zZFZTaTFDV0U1RkptbHpYM0J2Y0c5MWREMHhJQUklM0QwAUopCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoAUPOaw8P2muUCWANoAYIBAggB",
   "csn": "PvujXbH0OIazqQHXgJ64DQ",
   "endpoint": {
     "commandMetadata": {

tests/testdata/compatible/newSponsor_rev.json

@@ -4,7 +4,7 @@
             "st": 100
         }
     },
-    "response": {
+    
         "responseContext": {
             "serviceTrackingParams": [
                 {
@@ -1805,7 +1805,7 @@
             }
         },
         "trackingParams": "CAAQ0b4BIhMI1LbVw_aa5QIV2cxMAh2AtAj8"
-    },
+    ,
     "url": "\/live_chat\/get_live_chat?continuation=0ofMyAOBAhrKAUNrd1NJUW9ZVlVOdVVsRlpTRlJ1VWt4VFJqQmpURXAzVFc1bFpFTm5FZ1V2YkdsMlpTb25DaGhWUTI1U1VWbElWRzVTVEZOR01HTk1TbmROYm1Wa1EyY1NDMDFETTNkVlNpMUNXRTVGR2tPcXVjRzlBVDBLTzJoMGRIQnpPaTh2ZDNkM0xubHZkWFIxWW1VdVkyOXRMMnhwZG1WZlkyaGhkRDkyUFUxRE0zZFZTaTFDV0U1RkptbHpYM0J2Y0c5MWREMHhJQUklM0QwAUopCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoAUPOaw8P2muUCWANoAYIBAggB",
     "csn": "PvujXbH0OIazqQHXgJ64DQ",
     "endpoint": {

tests/testdata/compatible/superchat.json

@@ -15,9 +15,9 @@
       "url": "/live_chat/get_live_chat?continuation=0ofMyAPiARp8Q2c4S0RRb0xPREJQZW5SS2FIVTNOemdhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5T0RCUGVuUkthSFUzTnpnbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCja2bHMpPvkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQwJKPoqT75AJYA1DXxuTMpPvkAliL_fvZoPvkAmgBggEECAEQAIgBAKABxM3xzKT75AI%253D"
     }
   },
-    "url": "\/live_chat\/get_live_chat?continuation=0ofMyAPiARp8Q2c4S0RRb0xPREJQZW5SS2FIVTNOemdhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5T0RCUGVuUkthSFUzTnpnbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCja2bHMpPvkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQwJKPoqT75AJYA1DXxuTMpPvkAliL_fvZoPvkAmgBggEECAEQAIgBAKABxM3xzKT75AI%253D",
+  "url": "/live_chat/get_live_chat?continuation=0ofMyAPiARp8Q2c4S0RRb0xPREJQZW5SS2FIVTNOemdhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5T0RCUGVuUkthSFUzTnpnbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCja2bHMpPvkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQwJKPoqT75AJYA1DXxuTMpPvkAliL_fvZoPvkAmgBggEECAEQAIgBAKABxM3xzKT75AI%253D",
   "csn": "n2STXd2iKZr2gAOt9qvgCg",
-    "response": {
+
   "responseContext": {
     "serviceTrackingParams": [
       {
@@ -278,5 +278,4 @@
       ]
     }
   }
-    }
 }

tests/testdata/compatible/supersticker.json

@@ -15,9 +15,8 @@
       "url": "/live_chat/get_live_chat?continuation=0ofMyAPiARp8Q2c4S0RRb0xPREJQZW5SS2FIVTNOemdhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5T0RCUGVuUkthSFUzTnpnbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCja2bHMpPvkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQwJKPoqT75AJYA1DXxuTMpPvkAliL_fvZoPvkAmgBggEECAEQAIgBAKABxM3xzKT75AI%253D"
     }
   },
-    "url": "\/live_chat\/get_live_chat?continuation=0ofMyAPiARp8Q2c4S0RRb0xPREJQZW5SS2FIVTNOemdhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5T0RCUGVuUkthSFUzTnpnbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCja2bHMpPvkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQwJKPoqT75AJYA1DXxuTMpPvkAliL_fvZoPvkAmgBggEECAEQAIgBAKABxM3xzKT75AI%253D",
+  "url": "/live_chat/get_live_chat?continuation=0ofMyAPiARp8Q2c4S0RRb0xPREJQZW5SS2FIVTNOemdhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5T0RCUGVuUkthSFUzTnpnbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCja2bHMpPvkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQwJKPoqT75AJYA1DXxuTMpPvkAliL_fvZoPvkAmgBggEECAEQAIgBAKABxM3xzKT75AI%253D",
   "csn": "n2STXd2iKZr2gAOt9qvgCg",
-    "response": {
   "responseContext": {
     "serviceTrackingParams": [
       {
@@ -193,5 +192,4 @@
       ]
     }
   }
-    }
 }

tests/testdata/compatible/textmessage.json

@@ -1,5 +1,4 @@
 {
-    "response": {
   "responseContext": {
     "serviceTrackingParams": [
       {
@@ -154,7 +153,6 @@
         }
       ]
     }
-        }
   },
   "endpoint": {
     "commandMetadata": {
@@ -168,7 +166,7 @@
   },
   "csn": "n96GXabRGouFlQTigY2YDg",
   "xsrf_token": "QUFFLUhqbHNNWTF3NFJqc2h3cGE1NE9FWGdaWk5mRlVhUXxBQ3Jtc0tuTWhZNFcyTW1iZnA3ZnFTYUFudVFEUVE0cnFEOVBGcEU1MEh0Zlh4bll1amVmRl9OMkxZV3pKV1ZSbExBeDctTl95NGtBVnJZdlNxeS1KdWVNempEN2N6MHhaU1laV3hnVkZPeHp1OHVDTGVFSGUyOGduT0szbDV5N05LYUZTdzdoTDRwV1VJWndaVjdQVGRjNWVpR0YwUXgtZXc=",
-    "url": "\/live_chat\/get_live_chat?continuation=0ofMyAPiARp8Q2c4S0RRb0xhelJMZDBsWFQwdERkalFhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5YXpSTGQwbFhUMHREZGpRbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCiPz5-Os-PkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQgJqXjrPj5AJYA1CRwciOs-PkAli3pNq1k-PkAmgBggEECAEQAIgBAKABjbfnjrPj5AI%253D",
+  "url": "/live_chat/get_live_chat?continuation=0ofMyAPiARp8Q2c4S0RRb0xhelJMZDBsWFQwdERkalFhUTZxNXdiMEJQUW83YUhSMGNITTZMeTkzZDNjdWVXOTFkSFZpWlM1amIyMHZiR2wyWlY5amFHRjBQM1k5YXpSTGQwbFhUMHREZGpRbWFYTmZjRzl3YjNWMFBURWdBZyUzRCUzRCiPz5-Os-PkAjAAOABAAUorCAAQABgAIAAqDnN0YXRpY2NoZWNrc3VtOgBAAEoCCAFQgJqXjrPj5AJYA1CRwciOs-PkAli3pNq1k-PkAmgBggEECAEQAIgBAKABjbfnjrPj5AI%253D",
   "timing": {
     "info": {
       "st": 81

tests/testdata/default/newSponsor_current.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -96,5 +95,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/default/newSponsor_lagacy.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -78,5 +77,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/default/replay_member_text.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": "data"
   },
@@ -108,5 +107,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/default/superchat.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -180,5 +179,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/default/supersticker.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -95,5 +94,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/default/textmessage.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -75,5 +74,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/extract_duplcheck/head/dp0-0.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -6124,5 +6123,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/extract_duplcheck/head/dp0-1.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -3074,5 +3073,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/extract_duplcheck/head/dp0-2.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -3074,5 +3073,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/extract_duplcheck/head/dp0-3.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -3074,5 +3073,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/extract_duplcheck/head/dp0-4.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -2525,5 +2524,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/extract_duplcheck/head/dp0-5.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -1427,5 +1426,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/extract_duplcheck/overlap/dp0-0.json

@@ -1,5 +1,4 @@
 {
- "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -6124,5 +6123,4 @@
       ]
     }
   }
- }
 }

tests/testdata/extract_duplcheck/overlap/dp0-1.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -3074,5 +3073,4 @@
    ]
   }
  }
- }
 }

tests/testdata/extract_duplcheck/overlap/dp0-2.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -3074,5 +3073,4 @@
    ]
   }
  }
- }
 }

tests/testdata/extract_duplcheck/overlap/dp0-3.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -3074,5 +3073,4 @@
    ]
   }
  }
- }
 }

tests/testdata/extract_duplcheck/overlap/dp0-4.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -2525,5 +2524,4 @@
    ]
   }
  }
- }
 }

tests/testdata/extract_duplcheck/overlap/dp0-5.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -1427,5 +1426,4 @@
    ]
   }
  }
- }
 }

tests/testdata/fetch_patch/pt0-0.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -3074,5 +3073,4 @@
    ]
   }
  }
- }
 }

tests/testdata/fetch_patch/pt0-1.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -3074,5 +3073,4 @@
    ]
   }
  }
- }
 }

tests/testdata/fetch_patch/pt0-3.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -3074,5 +3073,4 @@
    ]
   }
  }
- }
 }

tests/testdata/fetch_patch/pt0-4.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -3074,5 +3073,4 @@
    ]
   }
  }
- }
 }

tests/testdata/fetch_patch/pt0-5.json

@@ -1,5 +1,4 @@
 {
- "response": {
  "responseContext": {
   "webResponseContextExtensionData": ""
  },
@@ -3074,5 +3073,4 @@
    ]
   }
  }
- }
 }

tests/testdata/speed/speedtest_empty.json

@@ -5,20 +5,17 @@
     }
   },
   "csn": "",
-  "response": {
+  "responseContext": {},
-    "responseContext": {
-    },
   "continuationContents": {
     "liveChatContinuation": {
-        "continuations": [{
+      "continuations": [
+        {
           "timedContinuationData": {
             "timeoutMs": 10000,
             "continuation": "continuation"
           }
-        }]
         }
+      ]
     }
   }
 }
-    
-

tests/testdata/speed/speedtest_normal.json

@@ -5,24 +5,23 @@
     }
   },
   "csn": "",
-  "response": {
+  "responseContext": {},
-    "responseContext": {
-    },
   "continuationContents": {
     "liveChatContinuation": {
-        "continuations": [{
+      "continuations": [
+        {
           "timedContinuationData": {
             "timeoutMs": 10000,
             "continuation": "continuation"
           }
-        }],
+        }
-        "actions": [{
+      ],
+      "actions": [
+        {
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -31,9 +30,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -42,9 +39,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -53,9 +48,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -64,9 +57,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -75,9 +66,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -86,9 +75,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -97,9 +84,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -108,9 +93,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -119,9 +102,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -130,9 +111,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -141,9 +120,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -152,9 +129,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -163,9 +138,7 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000000000000"
-
               }
             }
           }
@@ -174,15 +147,12 @@
           "addChatItemAction": {
             "item": {
               "liveChatTextMessageRenderer": {
-                
                 "timestampUsec": "1500000030000000"
-
               }
             }
           }
         }
-      ]}
+      ]
     }
   }
 }
-    

tests/testdata/speed/speedtest_undefined.json

@@ -5,18 +5,19 @@
     }
   },
   "csn": "",
-  "response": {
+  "responseContext": {},
-    "responseContext": {
-    },
   "continuationContents": {
     "liveChatContinuation": {
-        "continuations": [{
+      "continuations": [
+        {
           "timedContinuationData": {
             "timeoutMs": 10000,
             "continuation": "continuation"
           }
-        }],
+        }
-        "actions": [{
+      ],
+      "actions": [
+        {
           "addChatItemAction": {
             "liveChatPlaceholderItemRenderer": {
               "id": "",
@@ -30,13 +31,11 @@
               "liveChatPlaceholderItemRenderer": {
                 "id": "",
                 "timestampUsec": "1500000030000000"
-
               }
             }
           }
         }
-      ]}
+      ]
     }
   }
 }
-    

tests/testdata/test_stream.json

@@ -1,5 +1,4 @@
 {
-  "response": {
   "responseContext": {
     "webResponseContextExtensionData": ""
   },
@@ -505,5 +504,4 @@
       ]
     }
   }
-  }
 }

tests/testdata/unregistered_currency.json

@@ -5,66 +5,89 @@
     }
   },
   "csn": "",
-  "response": {
   "responseContext": {
-      "serviceTrackingParams": [{
+    "serviceTrackingParams": [
+      {
         "service": "CSI",
-        "params": [{
+        "params": [
+          {
             "key": "GetLiveChat_rid",
             "value": ""
-        }, {
+          },
+          {
             "key": "c",
             "value": "WEB"
-        }, {
+          },
+          {
             "key": "cver",
             "value": "2.20191219.03.01"
-        }, {
+          },
+          {
             "key": "yt_li",
             "value": "0"
-        }]
+          }
-      }, {
+        ]
+      },
+      {
         "service": "GFEEDBACK",
-        "params": [{
+        "params": [
+          {
             "key": "e",
             "value": ""
-        }, {
+          },
+          {
             "key": "logged_in",
             "value": "0"
-        }]
+          }
-      }, {
+        ]
+      },
+      {
         "service": "GUIDED_HELP",
-        "params": [{
+        "params": [
+          {
             "key": "logged_in",
             "value": "0"
-        }]
+          }
-      }, {
+        ]
+      },
+      {
         "service": "ECATCHER",
-        "params": [{
+        "params": [
+          {
             "key": "client.name",
             "value": "WEB"
-        }, {
+          },
+          {
             "key": "client.version",
             "value": "2.2"
-        }, {
+          },
+          {
             "key": "innertube.build.changelist",
             "value": "228"
-        }, {
+          },
+          {
             "key": "innertube.build.experiments.source_version",
             "value": "2858"
-        }, {
+          },
+          {
             "key": "innertube.build.label",
             "value": "youtube.ytfe.innertube_"
-        }, {
+          },
+          {
             "key": "innertube.build.timestamp",
             "value": "154"
-        }, {
+          },
+          {
             "key": "innertube.build.variants.checksum",
             "value": "e"
-        }, {
+          },
+          {
             "key": "innertube.run.job",
             "value": "ytfe-innertube-replica-only.ytfe"
-        }]
+          }
-      }],
+        ]
+      }
+    ],
     "webResponseContextExtensionData": {
       "ytConfigData": {
         "csn": "ADw",
@@ -74,13 +97,16 @@
   },
   "continuationContents": {
     "liveChatContinuation": {
-        "continuations": [{
+      "continuations": [
+        {
           "timedContinuationData": {
             "timeoutMs": 10000,
             "continuation": "continuation"
           }
-        }],
+        }
-        "actions": [{
+      ],
+      "actions": [
+        {
           "addChatItemAction": {
             "item": {
               "liveChatPaidMessageRenderer": {
@@ -136,10 +162,12 @@
                   }
                 }
               }
-              }, "clientId": "00000000000000000000"
+            },
+            "clientId": "00000000000000000000"
           }
         }
-      ]}
+      ]
+    }
   },
 
   "xsrf_token": "xsrf_token",
@@ -155,6 +183,4 @@
       "url": "/live_chat/get_live_chat?continuation=0"
     }
   }
-  }
 }
-