Skip to content

chain inserts together to fix ownership issue #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chain inserts together to fix ownership issue #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions registry/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,7 @@ fn prove(working_dir : &Option<String>) -> Result<(Vec<Commitment>, HashMap<Stri
Ok((output, tx_set))
}


fn commit(args : CommitArgs) -> Result<(), Error> {
fn commit(args: CommitArgs) -> Result<(), Error> {
let uncommitted_path = get_working_dir(&args.c)?.join(STAGING_FILE);
if !std::path::Path::new(uncommitted_path.to_str().unwrap()).exists() {
return Err(Error::from(io::Error::new(io::ErrorKind::InvalidData, "No changes to prove and commit")));
Expand All @@ -320,12 +319,21 @@ fn commit(args : CommitArgs) -> Result<(), Error> {
let filename = format!("{}.sdb", space);
let path = path.join(filename);
let db = Database::open(path.to_str().unwrap())?;
let mut tx = db.begin_write().unwrap();

// Collect all changes first
let reader = TransactionReader(raw.as_slice());

for t in reader.iter() {
let key = t.subspace_hash.try_into().unwrap();
tx.insert(key, t.owner.to_vec()).unwrap();
let changes: Vec<_> = reader.iter()
.map(|t| {
let key = t.subspace_hash.try_into()
.map_err(|_| io::Error::new(io::ErrorKind::InvalidData, "Invalid subspace hash"))?;
Ok((key, t.owner.to_vec()))
})
.collect::<Result<_, io::Error>>()?;

// Chain the inserts together
let mut tx = db.begin_write()?;
for (key, value) in changes {
tx = tx.insert(key, value)?;
}
tx.commit()?;
}
Expand Down