Skip to content

Commit a1246ec

Browse files
authored
refactor(tap): return optional in process db receipts (#713)
1 parent ab4aaba commit a1246ec

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

crates/service/src/tap/receipt_store.rs

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,19 @@ impl InnerContext {
5959
(Err(e1), Ok(_)) => Err(ProcessReceiptError::V1(e1.into())),
6060
(Ok(_), Err(e2)) => Err(ProcessReceiptError::V2(e2.into())),
6161

62-
(Ok(0), Ok(0)) => Ok(ProcessedReceipt::None),
63-
(Ok(_), Ok(0)) => Ok(ProcessedReceipt::V1),
64-
(Ok(0), Ok(_)) => Ok(ProcessedReceipt::V2),
65-
(Ok(_), Ok(_)) => Ok(ProcessedReceipt::Both),
62+
(Ok(None), Ok(None)) => Ok(ProcessedReceipt::None),
63+
(Ok(Some(_)), Ok(None)) => Ok(ProcessedReceipt::V1),
64+
(Ok(None), Ok(Some(_))) => Ok(ProcessedReceipt::V2),
65+
(Ok(Some(_)), Ok(Some(_))) => Ok(ProcessedReceipt::Both),
6666
}
6767
}
6868

69-
async fn store_receipts_v1(&self, receipts: Vec<DbReceiptV1>) -> Result<u64, AdapterError> {
69+
async fn store_receipts_v1(
70+
&self,
71+
receipts: Vec<DbReceiptV1>,
72+
) -> Result<Option<u64>, AdapterError> {
7073
if receipts.is_empty() {
71-
return Ok(0);
74+
return Ok(None);
7275
}
7376
let receipts_len = receipts.len();
7477
let mut signers = Vec::with_capacity(receipts_len);
@@ -116,12 +119,15 @@ impl InnerContext {
116119
anyhow!(e)
117120
})?;
118121

119-
Ok(query_res.rows_affected())
122+
Ok(Some(query_res.rows_affected()))
120123
}
121124

122-
async fn store_receipts_v2(&self, receipts: Vec<DbReceiptV2>) -> Result<u64, AdapterError> {
125+
async fn store_receipts_v2(
126+
&self,
127+
receipts: Vec<DbReceiptV2>,
128+
) -> Result<Option<u64>, AdapterError> {
123129
if receipts.is_empty() {
124-
return Ok(0);
130+
return Ok(None);
125131
}
126132
let receipts_len = receipts.len();
127133
let mut signers = Vec::with_capacity(receipts_len);
@@ -184,7 +190,7 @@ impl InnerContext {
184190
anyhow!(e)
185191
})?;
186192

187-
Ok(query_res.rows_affected())
193+
Ok(Some(query_res.rows_affected()))
188194
}
189195
}
190196

0 commit comments

Comments
 (0)