Fix merge mistakes and make the `Vapid` component freestanding.

In 4a91792e023a5877f8ac9b8a352e99c4486d698f, I merged in the app component struct changes, but neglected to notice that the `app.vapid()` method had ended up attached to the wrong impl block during the merge. This fixes that.

I've also carried the change to component structs through, so `Vapid` is now a freestanding component, rather than a view of the `App` struct's internals.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/boot/handlers/boot/test.rs b/src/boot/handlers/boot/test.rs
index 7eb4e52..f192478 100644
--- a/src/boot/handlers/boot/test.rs
+++ b/src/boot/handlers/boot/test.rs
@@ -90,7 +90,7 @@ async fn includes_vapid_key() {
         .expect("key rotation always succeeds");
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app), viewer)
+    let response = super::handler(State(app.boot()), viewer)
         .await
         .expect("boot always succeeds");
 
@@ -114,7 +114,7 @@ async fn includes_only_latest_vapid_key() {
         .expect("key rotation always succeeds");
 
     let viewer = fixtures::identity::fictitious();
-    let response = super::handler(State(app.clone()), viewer.clone())
+    let response = super::handler(State(app.boot()), viewer.clone())
         .await
         .expect("boot always succeeds");
 
@@ -132,7 +132,7 @@ async fn includes_only_latest_vapid_key() {
         .await
         .expect("key rotation always succeeds");
 
-    let response = super::handler(State(app), viewer)
+    let response = super::handler(State(app.boot()), viewer)
         .await
         .expect("boot always succeeds");