attestation-service: rename builtin rvps

Since we changed the name of "core" to Rvps, we need to change the code
in the attestation service where we use the builtin rvps.

Also, change the rvps struct in the AS to BuiltinRvps. This isn't
strictly necessary (since it's in a module called Builtin) but it avoids
a naming collision.

Signed-off-by: Tobin Feldman-Fitzthum <tobin@ibm.com>

attestation-service/src/rvps/builtin.rs

@@ -1,29 +1,29 @@
 use super::{Result, RvpsApi};
 use async_trait::async_trait;
 use core::result::Result::Ok;
-use reference_value_provider_service::{Config, Core};
+use reference_value_provider_service::{Config, Rvps};
 use std::collections::HashMap;
 
-pub struct Rvps {
-    core: Core,
+pub struct BuiltinRvps {
+    rvps: Rvps,
 }
 
-impl Rvps {
+impl BuiltinRvps {
     pub fn new(config: Config) -> Result<Self> {
-        let core = Core::new(config)?;
-        Ok(Self { core })
+        let rvps = Rvps::new(config)?;
+        Ok(Self { rvps })
     }
 }
 
 #[async_trait]
-impl RvpsApi for Rvps {
+impl RvpsApi for BuiltinRvps {
     async fn verify_and_extract(&mut self, message: &str) -> Result<()> {
-        self.core.verify_and_extract(message).await?;
+        self.rvps.verify_and_extract(message).await?;
         Ok(())
     }
 
     async fn get_digests(&self) -> Result<HashMap<String, Vec<String>>> {
-        let hashes = self.core.get_digests().await?;
+        let hashes = self.rvps.get_digests().await?;
 
         Ok(hashes)
     }

attestation-service/src/rvps/mod.rs

@@ -64,7 +64,8 @@ pub async fn initialize_rvps_client(config: &RvpsConfig) -> Result<Box<dyn RvpsA
     match config {
         RvpsConfig::BuiltIn(config) => {
             info!("launch a built-in RVPS.");
-            Ok(Box::new(builtin::Rvps::new(config.clone())?) as Box<dyn RvpsApi + Send + Sync>)
+            Ok(Box::new(builtin::BuiltinRvps::new(config.clone())?)
+                as Box<dyn RvpsApi + Send + Sync>)
         }
         #[cfg(feature = "rvps-grpc")]
         RvpsConfig::GrpcRemote(config) => {