1 files changed, 17 insertions, 14 deletions
diff --git a/internal/transport/delivery/delivery_test.go b/internal/transport/delivery/delivery_test.go
index e9eaf8fd1..81f32d5f8 100644
--- a/internal/transport/delivery/delivery_test.go
+++ b/internal/transport/delivery/delivery_test.go
@@ -35,32 +35,30 @@ var deliveryCases = []struct {
 }{
 	{
 		msg: delivery.Delivery{
-			PubKeyID: "https://google.com/users/bigboy#pubkey",
 			ActorID:  "https://google.com/users/bigboy",
 			ObjectID: "https://google.com/users/bigboy/follow/1",
 			TargetID: "https://askjeeves.com/users/smallboy",
-			Request:  toRequest("POST", "https://askjeeves.com/users/smallboy/inbox", []byte("data!")),
+			Request:  toRequest("POST", "https://askjeeves.com/users/smallboy/inbox", []byte("data!"), http.Header{"Hello": {"world1", "world2"}}),
 		},
 		data: toJSON(map[string]any{
-			"pub_key_id": "https://google.com/users/bigboy#pubkey",
-			"actor_id":   "https://google.com/users/bigboy",
-			"object_id":  "https://google.com/users/bigboy/follow/1",
-			"target_id":  "https://askjeeves.com/users/smallboy",
-			"method":     "POST",
-			"url":        "https://askjeeves.com/users/smallboy/inbox",
-			"body":       []byte("data!"),
-			// "header":     map[string][]string{},
+			"actor_id":  "https://google.com/users/bigboy",
+			"object_id": "https://google.com/users/bigboy/follow/1",
+			"target_id": "https://askjeeves.com/users/smallboy",
+			"method":    "POST",
+			"url":       "https://askjeeves.com/users/smallboy/inbox",
+			"body":      []byte("data!"),
+			"header":    map[string][]string{"Hello": {"world1", "world2"}},
 		}),
 	},
 	{
 		msg: delivery.Delivery{
-			Request: toRequest("GET", "https://google.com", []byte("uwu im just a wittle seawch engwin")),
+			Request: toRequest("GET", "https://google.com", []byte("uwu im just a wittle seawch engwin"), nil),
 		},
 		data: toJSON(map[string]any{
 			"method": "GET",
 			"url":    "https://google.com",
 			"body":   []byte("uwu im just a wittle seawch engwin"),
-			// "header":     map[string][]string{},
+			// "header": map[string][]string{},
 		}),
 	},
 }
@@ -89,18 +87,18 @@ func TestDeserializeDelivery(t *testing.T) {
 		}
 
 		// Check that delivery fields are as expected.
-		assert.Equal(t, test.msg.PubKeyID, msg.PubKeyID)
 		assert.Equal(t, test.msg.ActorID, msg.ActorID)
 		assert.Equal(t, test.msg.ObjectID, msg.ObjectID)
 		assert.Equal(t, test.msg.TargetID, msg.TargetID)
 		assert.Equal(t, test.msg.Request.Method, msg.Request.Method)
 		assert.Equal(t, test.msg.Request.URL, msg.Request.URL)
 		assert.Equal(t, readBody(test.msg.Request.Body), readBody(msg.Request.Body))
+		assert.Equal(t, test.msg.Request.Header, msg.Request.Header)
 	}
 }
 
 // toRequest creates httpclient.Request from HTTP method, URL and body data.
-func toRequest(method string, url string, body []byte) httpclient.Request {
+func toRequest(method string, url string, body []byte, hdr http.Header) *httpclient.Request {
 	var rbody io.Reader
 	if body != nil {
 		rbody = bytes.NewReader(body)
@@ -109,6 +107,11 @@ func toRequest(method string, url string, body []byte) httpclient.Request {
 	if err != nil {
 		panic(err)
 	}
+	for key, values := range hdr {
+		for _, value := range values {
+			req.Header.Add(key, value)
+		}
+	}
 	return httpclient.WrapRequest(req)
 }