Skip to content

Commit

Permalink
Merge pull request bitcoin#5 from rajarshimaitra/stash_trait_modifica…
Browse files Browse the repository at this point in the history
…tion

Modification of Stash trait
  • Loading branch information
dr-orlovsky committed Feb 28, 2021
2 parents f655958 + 9bc21a9 commit db9c5df
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/stash/stash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// If not, see <https://opensource.org/licenses/MIT>.

use std::collections::BTreeSet;
use lnpbp::seals::OutpointReveal;

use crate::{
Anchor, Consignment, ContractId, Disclosure, Extension, Genesis, Node,
Expand Down Expand Up @@ -81,8 +82,9 @@ pub trait Stash {
/// and it gets into the known data.
fn merge(
&mut self,
consignment: Consignment,
) -> Result<Vec<Box<dyn Node>>, Self::Error>;
consignment: &Consignment,
known_seals: &Vec<OutpointReveal>,
) -> Result<(), Self::Error>;

/// If we need to forget about the state which is not owned by us anymore
/// (we have done the transfer and would like to prune this specific info)
Expand Down

0 comments on commit db9c5df

Please sign in to comment.