rename to digest

fundthmcalculus · fundthmcalculus · commit f0157b9d2ff0 · 2022-02-10T08:53:27.000-05:00
diff --git a/native/Cargo.toml b/native/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2018"
 # cause vendored libraries to fail compilation due
 # to dependency on protoc compiler
 # if you need to compile .proto files, use this line:
-build = "build.rs"
-#build = false
+#build = "build.rs"
+build = false
 
 [dependencies]
 chacha20poly1305 = "0.7.0"
diff --git a/native/src/hashing/mod.rs b/native/src/hashing/mod.rs
@@ -9,7 +9,7 @@ impl crate::Hashing {
         // Hash the provided data
         let hash1 = blake3::hash(data.as_slice());
         Ok(Blake3HashResponse {
-            output: hash1.as_bytes().to_vec(),
+            digest: hash1.as_bytes().to_vec(),
         })
     }
 
@@ -21,7 +21,7 @@ impl crate::Hashing {
         // Hash the provided data
         let hash1 = blake3::keyed_hash(key_slice, data.as_slice());
         Ok(Blake3KeyedHashResponse {
-            output: hash1.as_bytes().to_vec(),
+            digest: hash1.as_bytes().to_vec(),
         })
     }
 
@@ -31,7 +31,7 @@ impl crate::Hashing {
         // Hash the provided data
         let hash1 = blake3::derive_key(str::from_utf8(context.as_slice()).unwrap(), key_material.as_slice());
         Ok(Blake3DeriveKeyResponse {
-            output: hash1.to_vec(),
+            digest: hash1.to_vec(),
         })
     }
 }
@@ -48,7 +48,7 @@ mod test {
         let request = Blake3HashRequest{data: data.as_bytes().to_vec() };
         let response = Hashing::blake3_hash(&request).unwrap();
         let hash_data = blake3::hash(data.as_bytes());
-        assert_eq!(response.output.as_slice(), hash_data.as_bytes())
+        assert_eq!(response.digest.as_slice(), hash_data.as_bytes())
     }
 
     #[test]
@@ -58,7 +58,7 @@ mod test {
         let request = Blake3KeyedHashRequest{data: data.as_bytes().to_vec(), key: key_str.as_bytes().to_vec() };
         let response = Hashing::blake3_keyed_hash(&request).unwrap();
         let hash_data = blake3::keyed_hash(<&[u8; 32]>::try_from(key_str.as_bytes()).unwrap(), data.as_bytes());
-        assert_eq!(response.output.as_slice(), hash_data.as_bytes())
+        assert_eq!(response.digest.as_slice(), hash_data.as_bytes())
     }
 
     #[test]
@@ -76,6 +76,6 @@ mod test {
         let request = Blake3DeriveKeyRequest{context: context.as_bytes().to_vec(), key_material: data.as_bytes().to_vec()};
         let response = Hashing::blake3_derive_key(&request).unwrap();
         let hash_data = blake3::derive_key(&*context, data.as_bytes());
-        assert_eq!(response.output.as_slice(), hash_data)
+        assert_eq!(response.digest.as_slice(), hash_data)
     }
 }
diff --git a/native/src/proto/okapi/okapi_hashing.rs b/native/src/proto/okapi/okapi_hashing.rs
@@ -8,7 +8,7 @@ pub struct Blake3HashRequest {
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Blake3HashResponse {
     #[prost(bytes="vec", tag="1")]
-    pub output: ::prost::alloc::vec::Vec<u8>,
+    pub digest: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(::serde::Serialize, ::serde::Deserialize)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -22,7 +22,7 @@ pub struct Blake3KeyedHashRequest {
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Blake3KeyedHashResponse {
     #[prost(bytes="vec", tag="1")]
-    pub output: ::prost::alloc::vec::Vec<u8>,
+    pub digest: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(::serde::Serialize, ::serde::Deserialize)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -36,5 +36,5 @@ pub struct Blake3DeriveKeyRequest {
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Blake3DeriveKeyResponse {
     #[prost(bytes="vec", tag="1")]
-    pub output: ::prost::alloc::vec::Vec<u8>,
+    pub digest: ::prost::alloc::vec::Vec<u8>,
 }
diff --git a/proto/okapi/hashing/v1/hashing.proto b/proto/okapi/hashing/v1/hashing.proto
@@ -12,7 +12,7 @@ message Blake3HashRequest {
 }
 
 message Blake3HashResponse {
-    bytes output = 1;
+    bytes digest = 1;
 }
 
 message Blake3KeyedHashRequest {
@@ -21,7 +21,7 @@ message Blake3KeyedHashRequest {
 }
 
 message Blake3KeyedHashResponse {
-    bytes output = 1;
+    bytes digest = 1;
 }
 
 message Blake3DeriveKeyRequest {
@@ -30,5 +30,5 @@ message Blake3DeriveKeyRequest {
 }
 
 message Blake3DeriveKeyResponse {
-    bytes output = 1;
+    bytes digest = 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ impl crate::Hashing {`
`9`	`9`	`// Hash the provided data`
`10`	`10`	`let hash1 = blake3::hash(data.as_slice());`
`11`	`11`	`Ok(Blake3HashResponse {`
`12`		`- output: hash1.as_bytes().to_vec(),`
	`12`	`+ digest: hash1.as_bytes().to_vec(),`
`13`	`13`	`})`
`14`	`14`	`}`
`15`	`15`
`@@ -21,7 +21,7 @@ impl crate::Hashing {`
`21`	`21`	`// Hash the provided data`
`22`	`22`	`let hash1 = blake3::keyed_hash(key_slice, data.as_slice());`
`23`	`23`	`Ok(Blake3KeyedHashResponse {`
`24`		`- output: hash1.as_bytes().to_vec(),`
	`24`	`+ digest: hash1.as_bytes().to_vec(),`
`25`	`25`	`})`
`26`	`26`	`}`
`27`	`27`
`@@ -31,7 +31,7 @@ impl crate::Hashing {`
`31`	`31`	`// Hash the provided data`
`32`	`32`	`let hash1 = blake3::derive_key(str::from_utf8(context.as_slice()).unwrap(), key_material.as_slice());`
`33`	`33`	`Ok(Blake3DeriveKeyResponse {`
`34`		`- output: hash1.to_vec(),`
	`34`	`+ digest: hash1.to_vec(),`
`35`	`35`	`})`
`36`	`36`	`}`
`37`	`37`	`}`
`@@ -48,7 +48,7 @@ mod test {`
`48`	`48`	`let request = Blake3HashRequest{data: data.as_bytes().to_vec() };`
`49`	`49`	`let response = Hashing::blake3_hash(&request).unwrap();`
`50`	`50`	`let hash_data = blake3::hash(data.as_bytes());`
`51`		`- assert_eq!(response.output.as_slice(), hash_data.as_bytes())`
	`51`	`+ assert_eq!(response.digest.as_slice(), hash_data.as_bytes())`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`#[test]`
`@@ -58,7 +58,7 @@ mod test {`
`58`	`58`	`let request = Blake3KeyedHashRequest{data: data.as_bytes().to_vec(), key: key_str.as_bytes().to_vec() };`
`59`	`59`	`let response = Hashing::blake3_keyed_hash(&request).unwrap();`
`60`	`60`	`let hash_data = blake3::keyed_hash(<&[u8; 32]>::try_from(key_str.as_bytes()).unwrap(), data.as_bytes());`
`61`		`- assert_eq!(response.output.as_slice(), hash_data.as_bytes())`
	`61`	`+ assert_eq!(response.digest.as_slice(), hash_data.as_bytes())`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`#[test]`
`@@ -76,6 +76,6 @@ mod test {`
`76`	`76`	`let request = Blake3DeriveKeyRequest{context: context.as_bytes().to_vec(), key_material: data.as_bytes().to_vec()};`
`77`	`77`	`let response = Hashing::blake3_derive_key(&request).unwrap();`
`78`	`78`	`let hash_data = blake3::derive_key(&*context, data.as_bytes());`
`79`		`- assert_eq!(response.output.as_slice(), hash_data)`
	`79`	`+ assert_eq!(response.digest.as_slice(), hash_data)`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ message Blake3HashRequest {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`message Blake3HashResponse {`
`15`		`- bytes output = 1;`
	`15`	`+ bytes digest = 1;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`message Blake3KeyedHashRequest {`
`@@ -21,7 +21,7 @@ message Blake3KeyedHashRequest {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`message Blake3KeyedHashResponse {`
`24`		`- bytes output = 1;`
	`24`	`+ bytes digest = 1;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`message Blake3DeriveKeyRequest {`
`@@ -30,5 +30,5 @@ message Blake3DeriveKeyRequest {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`message Blake3DeriveKeyResponse {`
`33`		`- bytes output = 1;`
	`33`	`+ bytes digest = 1;`
`34`	`34`	`}`