Skip to content

Commit bac34a8

Browse files
committed
Add some type conversions
1 parent 23c9aee commit bac34a8

File tree

3 files changed

+45
-3
lines changed

3 files changed

+45
-3
lines changed

mina-p2p-messages/src/v2/generated.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,7 @@ pub struct MinaBaseZkappCommandTStableV1WireStableV1 {
18951895
/// Gid: `823`
18961896
/// Location: [src/lib/mina_base/user_command.ml:7:6](https://github.com/MinaProtocol/mina/blob/bfd1009/src/lib/mina_base/user_command.ml#L7)
18971897
/// Args: MinaBaseSignedCommandStableV2 , MinaBaseZkappCommandTStableV1WireStableV1
1898-
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite)]
1898+
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite, derive_more::From)]
18991899
pub enum MinaBaseUserCommandStableV2 {
19001900
SignedCommand(MinaBaseSignedCommandStableV2),
19011901
ZkappCommand(MinaBaseZkappCommandTStableV1WireStableV1),

mina-p2p-messages/src/v2/manual.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use super::{
1818
ParallelScanWeightStableV1, PicklesProofProofsVerified2ReprStableV2,
1919
PicklesProofProofsVerified2ReprStableV2StatementFp, PicklesProofProofsVerifiedMaxStableV2,
2020
ProtocolVersionStableV1, SgnStableV1, TransactionSnarkScanStateStableV2ScanStateTreesABaseT1,
21-
TransactionSnarkScanStateStableV2ScanStateTreesAMergeT1,
21+
TransactionSnarkScanStateStableV2ScanStateTreesAMergeT1, CurrencyAmountStableV1,
2222
};
2323

2424
pub type TransactionSnarkScanStateStableV2TreesABase = (
@@ -707,7 +707,7 @@ mod tests_sgn {
707707
/// Args: CurrencyFeeStableV1 , SgnStableV1
708708
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite)]
709709
pub struct SignedAmount {
710-
pub magnitude: CurrencyFeeStableV1,
710+
pub magnitude: CurrencyAmountStableV1,
711711
pub sgn: SgnStableV1,
712712
}
713713

@@ -780,3 +780,5 @@ impl From<&PicklesProofProofsVerifiedMaxStableV2> for PicklesProofProofsVerified
780780
}
781781
}
782782
}
783+
784+
pub mod conv;
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
use crate::v2::{
2+
MinaBaseTransactionStatusStableV2, MinaBaseUserCommandStableV2,
3+
MinaTransactionLogicTransactionAppliedCommandAppliedStableV2,
4+
MinaTransactionLogicTransactionAppliedVaryingStableV2, MinaTransactionTransactionStableV2,
5+
};
6+
7+
/// Extract transaction data and status required by proof generation
8+
impl From<MinaTransactionLogicTransactionAppliedVaryingStableV2>
9+
for (
10+
MinaTransactionTransactionStableV2,
11+
MinaBaseTransactionStatusStableV2,
12+
)
13+
{
14+
fn from(value: MinaTransactionLogicTransactionAppliedVaryingStableV2) -> Self {
15+
match value {
16+
MinaTransactionLogicTransactionAppliedVaryingStableV2::Command(v) => match v {
17+
MinaTransactionLogicTransactionAppliedCommandAppliedStableV2::SignedCommand(v) => (
18+
MinaTransactionTransactionStableV2::Command(Box::new(
19+
MinaBaseUserCommandStableV2::SignedCommand(v.common.user_command.data),
20+
)),
21+
v.common.user_command.status,
22+
),
23+
MinaTransactionLogicTransactionAppliedCommandAppliedStableV2::ZkappCommand(v) => (
24+
MinaTransactionTransactionStableV2::Command(Box::new(
25+
MinaBaseUserCommandStableV2::ZkappCommand(v.command.data),
26+
)),
27+
v.command.status,
28+
),
29+
},
30+
MinaTransactionLogicTransactionAppliedVaryingStableV2::FeeTransfer(v) => (
31+
MinaTransactionTransactionStableV2::FeeTransfer(v.fee_transfer.data),
32+
v.fee_transfer.status,
33+
),
34+
MinaTransactionLogicTransactionAppliedVaryingStableV2::Coinbase(v) => (
35+
MinaTransactionTransactionStableV2::Coinbase(v.coinbase.data),
36+
v.coinbase.status,
37+
),
38+
}
39+
}
40+
}

0 commit comments

Comments
 (0)