Merge pull request #29 from RGB-WG/fix/force-accept

Fix force accept of invalid consignments
RGB-WG · Oct 23, 2023 · 083d5f0 · 083d5f0
2 parents 3ab17e7 + 581ebed
commit 083d5f0
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/bin/rgb/command.rs b/src/bin/rgb/command.rs
@@ -697,7 +697,16 @@ impl Command {
             }
             Command::Accept { force, file } => {
                 let bindle = Bindle::<Transfer>::load(file)?;
-                let transfer = bindle.unbindle().validate(resolver).unwrap_or_else(|c| c);
+                let transfer = bindle.unbindle().validate(resolver).or_else(|c| {
+                    if force {
+                        Ok(c)
+                    } else {
+                        Err(RuntimeError::InvalidConsignment(
+                            c.into_validation_status()
+                                .expect("consignment must have status after the validation"),
+                        ))
+                    }
+                })?;
                 eprintln!("{}", transfer.validation_status().expect("just validated"));
                 runtime.accept_transfer(transfer, resolver, force)?;
                 eprintln!("Transfer accepted into the stash");