kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-05-25 10:12:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: make attachment enqueuing fail specifically due to DB errors, since that's the only way it can fail

Browse Source
This commit is contained in:
Jude Nelson
2022-07-31 09:27:55 -04:00
parent 450ed0413c
commit dc2d1e06a1
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/net/atlas/download.rs
View File

@@ -33,6 +33,7 @@ use crate::net::NeighborKey;
use crate::net::{GetAttachmentResponse, GetAttachmentsInvResponse};
use crate::net::{HttpRequestMetadata, HttpRequestType, HttpResponseType, PeerHost, Requestable};
use crate::types::chainstate::StacksBlockId;
use crate::util_lib::db::Error as DBError;
use crate::util_lib::strings;
use crate::util_lib::strings::UrlString;
use clarity::vm::types::QualifiedContractIdentifier;
@@ -240,7 +241,7 @@ impl AttachmentsDownloader {
new_attachments: &mut HashSet<AttachmentInstance>,
atlasdb: &mut AtlasDB,
initial_batch: bool,
) -> Result<Vec<(AttachmentInstance, Attachment)>, net_error> {
) -> Result<Vec<(AttachmentInstance, Attachment)>, DBError> {
if new_attachments.is_empty() {
return Ok(vec![]);
}
@@ -251,9 +252,7 @@ impl AttachmentsDownloader {
// Are we dealing with an empty hash - allowed for undoing onchain binding
if attachment_instance.content_hash == Hash160::empty() {
// todo(ludo) insert or update ?
atlasdb
.insert_uninstantiated_attachment_instance(&attachment_instance, true)
.map_err(|e| net_error::DBError(e))?;
atlasdb.insert_uninstantiated_attachment_instance(&attachment_instance, true)?;
debug!("Atlas: inserting and pairing new attachment instance with empty hash");
resolved_attachments.push((attachment_instance, Attachment::empty()));
continue;
@@ -261,9 +260,7 @@ impl AttachmentsDownloader {
// Do we already have a matching validated attachment
if let Ok(Some(entry)) = atlasdb.find_attachment(&attachment_instance.content_hash) {
atlasdb
.insert_uninstantiated_attachment_instance(&attachment_instance, true)
.map_err(|e| net_error::DBError(e))?;
atlasdb.insert_uninstantiated_attachment_instance(&attachment_instance, true)?;
debug!(
"Atlas: inserting and pairing new attachment instance to existing attachment"
);
@@ -275,12 +272,8 @@ impl AttachmentsDownloader {
if let Ok(Some(attachment)) =
atlasdb.find_uninstantiated_attachment(&attachment_instance.content_hash)
{
atlasdb
.insert_instantiated_attachment(&attachment)
.map_err(|e| net_error::DBError(e))?;
atlasdb
.insert_uninstantiated_attachment_instance(&attachment_instance, true)
.map_err(|e| net_error::DBError(e))?;
atlasdb.insert_instantiated_attachment(&attachment)?;
atlasdb.insert_uninstantiated_attachment_instance(&attachment_instance, true)?;
debug!("Atlas: inserting and pairing new attachment instance to inboxed attachment, now validated");
resolved_attachments.push((attachment_instance, attachment));
continue;
@@ -300,9 +293,7 @@ impl AttachmentsDownloader {
};
if !initial_batch {
atlasdb
.insert_uninstantiated_attachment_instance(&attachment_instance, false)
.map_err(|e| net_error::DBError(e))?;
atlasdb.insert_uninstantiated_attachment_instance(&attachment_instance, false)?;
}
}