,
{
@@ -22,15 +22,12 @@ where
}
let signature = crypto::signature::Signer::sign(signer, &refs.canonical());
- let sigrefs = SignedRefs {
+ SignedRefs {
refs,
signature,
id: *signer.node_id(),
level: level.unwrap_or_else(|| FeatureLevel::arbitrary(g)),
parent: Arbitrary::arbitrary(g),
- };
- SignedRefsAt {
- sigrefs,
at: Oid::from_sha1(Arbitrary::arbitrary(g)),
}
}
diff --git a/crates/radicle/src/storage/refs/sigrefs/read.rs b/crates/radicle/src/storage/refs/sigrefs/read.rs
index 69212195..d01c2483 100644
--- a/crates/radicle/src/storage/refs/sigrefs/read.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/read.rs
@@ -19,8 +19,8 @@ use crate::git;
use crate::identity::doc;
use crate::storage::refs::sigrefs::git::{object, reference};
use crate::storage::refs::{
- FeatureLevel, Refs, SignedRefs, SignedRefsAt, IDENTITY_ROOT, REFS_BLOB_PATH,
- SIGNATURE_BLOB_PATH, SIGREFS_BRANCH,
+ FeatureLevel, Refs, SignedRefs, IDENTITY_ROOT, REFS_BLOB_PATH, SIGNATURE_BLOB_PATH,
+ SIGREFS_BRANCH,
};
/// A `rad/sigrefs` that has passed the following verification checks:
@@ -50,15 +50,13 @@ impl VerifiedCommit {
self.level
}
- pub(crate) fn into_sigrefs_at(self, id: PublicKey) -> SignedRefsAt {
- SignedRefsAt {
- sigrefs: SignedRefs {
- refs: self.commit.refs,
- signature: self.commit.signature,
- id,
- level: self.level,
- parent: self.commit.parent,
- },
+ pub(crate) fn into_sigrefs_at(self, id: PublicKey) -> SignedRefs {
+ SignedRefs {
+ refs: self.commit.refs,
+ signature: self.commit.signature,
+ id,
+ level: self.level,
+ parent: self.commit.parent,
at: self.commit.oid,
}
}
diff --git a/crates/radicle/src/storage/refs/sigrefs/write.rs b/crates/radicle/src/storage/refs/sigrefs/write.rs
index ec71a0eb..54088d27 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write.rs
@@ -16,11 +16,11 @@ use crate::git;
use crate::storage::refs::sigrefs::git::{object, reference, Committer};
use crate::storage::refs::sigrefs::read::CommitReader;
use crate::storage::refs::sigrefs::{read, VerifiedCommit};
+use crate::storage::refs::SignedRefs;
use crate::storage::refs::{
FeatureLevel, Refs, IDENTITY_ROOT, REFS_BLOB_PATH, SIGNATURE_BLOB_PATH, SIGREFS_BRANCH,
SIGREFS_PARENT,
};
-use crate::storage::refs::{SignedRefs, SignedRefsAt};
/// The result of attempting to write signed references using
/// [`SignedRefsWriter`].
@@ -204,16 +204,14 @@ impl Commit {
self.refs
}
- pub(crate) fn into_sigrefs_at(self, id: PublicKey, level: FeatureLevel) -> SignedRefsAt {
- SignedRefsAt {
+ pub(crate) fn into_sigrefs_at(self, id: PublicKey, level: FeatureLevel) -> SignedRefs {
+ SignedRefs {
at: self.oid,
- sigrefs: SignedRefs {
- id,
- signature: self.signature,
- refs: self.refs,
- level,
- parent: self.parent,
- },
+ id,
+ signature: self.signature,
+ refs: self.refs,
+ level,
+ parent: self.parent,
}
}
}
diff --git a/crates/radicle/src/test/fixtures.rs b/crates/radicle/src/test/fixtures.rs
index eb9d1c2b..bb80e6bc 100644
--- a/crates/radicle/src/test/fixtures.rs
+++ b/crates/radicle/src/test/fixtures.rs
@@ -10,7 +10,7 @@ use crate::node::Alias;
use crate::rad;
use crate::storage::git::transport;
use crate::storage::git::Storage;
-use crate::storage::refs::SignedRefsAt;
+use crate::storage::refs::SignedRefs;
/// The birth of the radicle project, January 1st, 2018.
pub const RADICLE_EPOCH: i64 = 1514817556;
@@ -72,7 +72,7 @@ pub fn project(
path: P,
storage: &Storage,
signer: &Device,
-) -> Result<(RepoId, SignedRefsAt, git::raw::Repository, git::raw::Oid), rad::InitError>
+) -> Result<(RepoId, SignedRefs, git::raw::Repository, git::raw::Oid), rad::InitError>
where
P: AsRef,
G: crypto::signature::Signer,
diff --git a/crates/radicle/src/test/storage.rs b/crates/radicle/src/test/storage.rs
index c41e0dc4..9bc00af7 100644
--- a/crates/radicle/src/test/storage.rs
+++ b/crates/radicle/src/test/storage.rs
@@ -134,7 +134,7 @@ impl WriteStorage for MockStorage {
pub struct MockRepository {
pub id: RepoId,
pub doc: DocAt,
- pub remotes: HashMap,
+ pub remotes: HashMap,
}
impl MockRepository {
@@ -170,7 +170,7 @@ impl self::refs::sigrefs::git::reference::Reader for MockRepository {
if reference == *refs::SIGREFS_BRANCH {
Ok(Some(refs.at))
} else {
- Ok(refs.sigrefs.get(&reference))
+ Ok(refs.get(&reference))
}
}
}
@@ -292,7 +292,7 @@ impl ReadRepository for MockRepository {
if reference == &*refs::SIGREFS_BRANCH {
Ok(refs.at)
} else {
- refs.sigrefs.get(reference).ok_or_else(not_found)
+ refs.get(reference).ok_or_else(not_found)
}
}
@@ -370,14 +370,14 @@ impl SignRepository for MockRepository {
fn sign_refs>(
&self,
_signer: &Device,
- ) -> Result {
+ ) -> Result {
todo!()
}
fn force_sign_refs>(
&self,
_signer: &Device,
- ) -> Result {
+ ) -> Result {
todo!()
}
}