GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify api commits (#3423)

Browse Source 
* simplify api with unspent by commitment

* fix chain tests
This commit is contained in:
Antioch Peverell
2020-08-17 18:19:29 +01:00
committed by GitHub
parent d1b90f89a0
commit 599bf22cfc
6 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chain/src/txhashset/txhashset.rs
+6 -4
View File
@@ -255,15 +255,17 @@ impl TxHashSet {
/// Check if an output is unspent.
/// We look in the index to find the output MMR pos.
/// Then we check the entry in the output MMR and confirm the hash matches.
pub fn get_unspent(&self, output_id: &OutputIdentifier) -> Result<Option<CommitPos>, Error> {
let commit = output_id.commit;
pub fn get_unspent(
&self,
commit: Commitment,
) -> Result<Option<(OutputIdentifier, CommitPos)>, Error> {
match self.commit_index.get_output_pos_height(&commit) {
Ok(Some(pos)) => {
let output_pmmr: ReadonlyPMMR<'_, Output, _> =
ReadonlyPMMR::at(&self.output_pmmr_h.backend, self.output_pmmr_h.last_pos);
if let Some(out) = output_pmmr.get_data(pos.pos) {
if out == *output_id {
Ok(Some(pos))
if out.commitment() == commit {
Ok(Some((out, pos)))
} else {
Ok(None)
}