Proxy Verifier: use concise stack protocol specification

tests/gold_tests/cache/replay/bg_fill.yaml

@@ -25,13 +25,9 @@ meta:
   version: '1.0'
 sessions:
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-    version: 4
+    stack: http2
+    tls:
+      sni: test_sni
   transactions:
   - client-request:
       frames:
@@ -65,13 +61,9 @@ sessions:
             size: 11
 
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-    version: 4
+    stack: http2
+    tls:
+      sni: test_sni
   transactions:
   - client-request:
       delay: 3s

tests/gold_tests/chunked_encoding/replays/chunked.replay.yaml

@@ -48,12 +48,7 @@ sessions:
         size: 32
 
 - protocol:
-  - name: http
-    version: 1
-  - name: tls
-  - name: tcp
-  - name: ip
-
+    stack: https
   transactions:
   - client-request:
       method: "GET"

tests/gold_tests/chunked_encoding/replays/large_chunked.replay.yaml

@@ -137,8 +137,7 @@ sessions:
 # HTTP/2 - dechunk
 
 - protocol:
-  - name: http
-    version: 2
+    stack: http2
   transactions:
   - client-request:
       headers:

tests/gold_tests/client_connection/http2_slow_origins.replay.yaml

@@ -33,13 +33,9 @@ meta:
 sessions:
 
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
+    stack: http2
+    tls:
+      sni: test_sni
   transactions:
 
   - client-request:
@@ -75,13 +71,9 @@ sessions:
         - [ X-Response, {value: 'first-response', as: equal } ]
 
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
+    stack: http2
+    tls:
+      sni: test_sni
   transactions:
 
   - client-request:
@@ -117,13 +109,9 @@ sessions:
         - [ X-Response, {value: 'second-response', as: equal } ]
 
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
+    stack: http2
+    tls:
+      sni: test_sni
   transactions:
 
   - client-request:
@@ -160,16 +148,12 @@ sessions:
 
 
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
-  # Make sure this is the last attempted transaction by giving the above
-  # three transactions, all executed in parallel, a one second head start.
-  # This connection should be aborted.
+    # Make sure this is the last attempted transaction by giving the above
+    # three transactions, all executed in parallel, a one second head start.
+    # This connection should be aborted.
+    stack: http2
+    tls:
+      sni: test_sni
   delay: 1s
 
   transactions:
@@ -198,13 +182,9 @@ sessions:
 # Note that this will delay after the previous 1s delay, so this is really
 # a delay of 3s.
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
+    stack: http2
+    tls:
+      sni: test_sni
   delay: 2s
 
   transactions:

tests/gold_tests/client_connection/https_slow_origins.replay.yaml

@@ -33,11 +33,9 @@ meta:
 sessions:
 
 - protocol:
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
+    stack: https
+    tls:
+      sni: test_sni
   transactions:
 
   - client-request:
@@ -75,11 +73,9 @@ sessions:
         - [ X-Response, {value: 'first-response', as: equal } ]
 
 - protocol:
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
+    stack: https
+    tls:
+      sni: test_sni
   transactions:
 
   - client-request:
@@ -117,11 +113,9 @@ sessions:
         - [ X-Response, {value: 'second-response', as: equal } ]
 
 - protocol:
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
+    stack: https
+    tls:
+      sni: test_sni
   transactions:
 
   - client-request:
@@ -160,14 +154,12 @@ sessions:
 
 
 - protocol:
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
-  # Make sure this is the last attempted transaction by giving the above
-  # three transactions, all executed in parallel, a one second head start.
-  # This connection should be aborted.
+    # Make sure this is the last attempted transaction by giving the above
+    # three transactions, all executed in parallel, a one second head start.
+    # This connection should be aborted.
+    stack: https
+    tls:
+      sni: test_sni
   delay: 1s
 
   transactions:
@@ -198,11 +190,9 @@ sessions:
 # Note that this will delay after the previous 1s delay, so this is really
 # a delay of 3s.
 - protocol:
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-
+    stack: https
+    tls:
+      sni: test_sni
   delay: 2s
 
   transactions:

tests/gold_tests/connect/replays/connect_h2.replay.yaml

@@ -23,13 +23,9 @@ meta:
 
 sessions:
   - protocol:
-      - name: http
-        version: 2
-      - name: tls
+      stack: http2
+      tls:
         sni: www.example.com
-      - name: tcp
-      - name: ip
-
     transactions:
       - client-request:
           frames:

tests/gold_tests/h2/expect_100_continue.yaml

@@ -19,15 +19,10 @@ meta:
 
 sessions:
   - protocol:
-      - name: http
-        version: '2'
-      - name: tls
+      stack: http2
+      tls:
         version: TLSv1.3
         sni: data.brian.example.com
-      - name: tcp
-      - name: ip
-        version: '4'
-
     transactions:
       - client-request:
           headers:

tests/gold_tests/h2/h2get_with_body.yaml

@@ -25,13 +25,9 @@ meta:
   version: '1.0'
 sessions:
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-    version: 4
+    stack: http2
+    tls:
+      sni: test_sni
   transactions:
   - client-request:
       frames:

tests/gold_tests/h2/http2_close_connection.yaml

@@ -25,13 +25,9 @@ meta:
   version: '1.0'
 sessions:
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
-    version: 4
+    stack: http2
+    tls:
+      sni: test_sni
   transactions:
   - client-request:
       frames:

tests/gold_tests/h2/http2_flow_control.replay.yaml

@@ -23,13 +23,9 @@ meta:
 sessions:
 
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: www.example.com
-  - name: tcp
-  - name: ip
-
+    stack: http2
+    tls:
+      sni: www.example.com
   transactions:
 
   - client-request:

tests/gold_tests/h2/http2_flow_control_chunked.replay.yaml

@@ -23,13 +23,9 @@ meta:
 sessions:
 
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: www.example.com
-  - name: tcp
-  - name: ip
-
+    stack: http2
+    tls:
+      sni: www.example.com
   transactions:
 
   - client-request:

tests/gold_tests/h2/replay/http2_concurrent_streams.replay.yaml

@@ -25,12 +25,9 @@ meta:
 
 sessions:
 - protocol:
-  - name: http
-    version: 2
-  - name: tls
-    sni: test_sni
-  - name: tcp
-  - name: ip
+    stack: http2
+    tls:
+      sni: test_sni
   transactions:
   # Stream 1
   - client-request: