Make TransactionKind have a reference to Signed

Broken commit due to partial staging of one file.
This commit is contained in:
Luke Parker
2023-04-12 09:38:20 -04:00
parent 354ac856a5
commit d5a12a9b97
4 changed files with 41 additions and 29 deletions

View File

@@ -19,15 +19,35 @@ use crate::{
// A transaction solely defined by its nonce and a distinguisher (to allow creating distinct TXs
// sharing a nonce).
#[derive(Clone, PartialEq, Eq, Debug)]
struct NonceTransaction(u32, u8);
struct NonceTransaction(u32, u8, Signed);
impl NonceTransaction {
fn new(nonce: u32, distinguisher: u8) -> Self {
NonceTransaction(
nonce,
distinguisher,
Signed {
signer: <Ristretto as Ciphersuite>::G::identity(),
nonce,
signature: SchnorrSignature::<Ristretto> {
R: <Ristretto as Ciphersuite>::G::identity(),
s: <Ristretto as Ciphersuite>::F::ZERO,
},
},
)
}
}
impl ReadWrite for NonceTransaction {
fn read<R: io::Read>(reader: &mut R) -> io::Result<Self> {
let mut nonce = [0; 4];
reader.read_exact(&mut nonce)?;
let nonce = u32::from_le_bytes(nonce);
let mut distinguisher = [0];
reader.read_exact(&mut distinguisher)?;
Ok(Self(u32::from_le_bytes(nonce), distinguisher[0]))
Ok(NonceTransaction::new(nonce, distinguisher[0]))
}
fn write<W: io::Write>(&self, writer: &mut W) -> io::Result<()> {
@@ -37,15 +57,8 @@ impl ReadWrite for NonceTransaction {
}
impl Transaction for NonceTransaction {
fn kind(&self) -> TransactionKind {
TransactionKind::Signed(Signed {
signer: <Ristretto as Ciphersuite>::G::identity(),
nonce: self.0,
signature: SchnorrSignature::<Ristretto> {
R: <Ristretto as Ciphersuite>::G::identity(),
s: <Ristretto as Ciphersuite>::F::ZERO,
},
})
fn kind(&self) -> TransactionKind<'_> {
TransactionKind::Signed(&self.2)
}
fn hash(&self) -> [u8; 32] {