diff options
| author | Alex Auvolat <alex@adnab.me> | 2020-11-29 16:21:28 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2020-11-29 16:21:28 +0100 |
| commit | 601ae25ad27d99c524691d5284e56b2e61545979 (patch) | |
| tree | a507a5b69054916f96a6c5017ea297b00bc7ccf6 | |
| parent | ba1f8060fe88e9eef97757d33bcc0972a2e327d9 (diff) | |
| download | garage-601ae25ad27d99c524691d5284e56b2e61545979.tar.gz garage-601ae25ad27d99c524691d5284e56b2e61545979.zip | |
Small refactorings
| -rw-r--r-- | src/api/s3_put.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs index a528720d..6906d758 100644 --- a/src/api/s3_put.rs +++ b/src/api/s3_put.rs @@ -51,12 +51,7 @@ pub async fn handle_put( let md5sum_arr = md5sum.finalize(); let md5sum_hex = hex::encode(md5sum_arr); - let mut sha256sum = Sha256::new(); - sha256sum.input(&first_block[..]); - let sha256sum_arr = sha256sum.result(); - let mut hash = [0u8; 32]; - hash.copy_from_slice(&sha256sum_arr[..]); - let sha256sum_hash = Hash::from(hash); + let sha256sum_hash = hash(&first_block[..]); ensure_checksum_matches( md5sum_arr.as_slice(), @@ -282,7 +277,6 @@ pub fn put_response(version_uuid: UUID, etag: String) -> Response<Body> { Response::builder() .header("x-amz-version-id", hex::encode(version_uuid)) .header("ETag", etag) - // TODO ETag .body(Body::from(vec![])) .unwrap() } @@ -369,7 +363,7 @@ pub async fn handle_put_part( } // Copy block to store - let version = Version::new(version_uuid, bucket.into(), key.into(), false, vec![]); + let version = Version::new(version_uuid, bucket, key, false, vec![]); let first_block_hash = hash(&first_block[..]); let (_, md5sum_arr, sha256sum) = read_and_put_blocks( &garage, |