aboutsummaryrefslogtreecommitdiff
path: root/src/table
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2020-11-08 18:04:52 +0100
committerAlex <alex@adnab.me>2020-11-08 18:04:52 +0100
commit045009da9b7ac4198574bd5aa256c11cfe4ae469 (patch)
treed3014cc2739c5a1bce62ff35efc8417b79ff46ef /src/table
parent54166d2a09f488bff080469160d4df6a78db1a3f (diff)
parenta50fa70d45f8b5af68d23d60c3bac2af4ecceb58 (diff)
downloadgarage-045009da9b7ac4198574bd5aa256c11cfe4ae469.tar.gz
garage-045009da9b7ac4198574bd5aa256c11cfe4ae469.zip
Merge pull request 'Refactor error management in API part' (#10) from error-refactoring into master
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/10
Diffstat (limited to 'src/table')
-rw-r--r--src/table/table.rs2
-rw-r--r--src/table/table_sync.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/table/table.rs b/src/table/table.rs
index 9d43a475..2beac3f4 100644
--- a/src/table/table.rs
+++ b/src/table/table.rs
@@ -329,7 +329,7 @@ where
.await?;
Ok(TableRPC::SyncRPC(response))
}
- _ => Err(Error::BadRequest(format!("Unexpected table RPC"))),
+ _ => Err(Error::BadRPC(format!("Unexpected table RPC"))),
}
}
diff --git a/src/table/table_sync.rs b/src/table/table_sync.rs
index 145b3068..6c0df15b 100644
--- a/src/table/table_sync.rs
+++ b/src/table/table_sync.rs
@@ -474,7 +474,7 @@ where
todo.push_back(root_ck);
}
} else {
- return Err(Error::BadRequest(format!(
+ return Err(Error::Message(format!(
"Invalid respone to GetRootChecksumRange RPC: {}",
debug_serialize(root_cks_resp)
)));
@@ -530,7 +530,7 @@ where
self.send_items(who, items_to_send).await?;
}
} else {
- return Err(Error::BadRequest(format!(
+ return Err(Error::Message(format!(
"Unexpected response to sync RPC checksums: {}",
debug_serialize(&rpc_resp)
)));