diff --git a/Cargo.lock b/Cargo.lock index 3c59dfb2ca64c0c23ba9c395740809a6ef10ad70..58e18e9520244b32f38d1f008cd7061e63a5556f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1163,9 +1163,9 @@ dependencies = [ name = "duniter-bca-types" version = "0.1.0" dependencies = [ + "bincode", "dubp", "serde", - "smallvec", ] [[package]] diff --git a/rust-libs/modules/gva/bca/src/lib.rs b/rust-libs/modules/gva/bca/src/lib.rs index 414872e77bc925e8d6247fe9b91b2c43e91d3e8b..b4928cee5a587eb1c7ef7845cc59d519d474cf52 100644 --- a/rust-libs/modules/gva/bca/src/lib.rs +++ b/rust-libs/modules/gva/bca/src/lib.rs @@ -33,7 +33,9 @@ use crate::utils::AsyncReader; use async_bincode::AsyncBincodeReader; use bincode::Options as _; use dubp::crypto::keys::{ed25519::Ed25519KeyPair, Signator}; -use duniter_bca_types::{BcaReq, BcaReqTypeV0, BcaResp, BcaRespTypeV0, BcaRespV0, ReqExecError}; +use duniter_bca_types::{ + bincode_opts, BcaReq, BcaReqTypeV0, BcaResp, BcaRespTypeV0, BcaRespV0, ReqExecError, +}; use duniter_dbs::{FileBackend, SharedDbs}; use futures::{prelude::stream::FuturesUnordered, StreamExt, TryStream, TryStreamExt}; use once_cell::sync::OnceCell; @@ -201,12 +203,6 @@ impl BcaExecutor { } } -pub(crate) fn bincode_opts() -> impl bincode::Options { - bincode::options() - .with_limit(u32::max_value() as u64) - .allow_trailing_bytes() -} - #[cfg(test)] mod tests { use super::*; diff --git a/rust-libs/modules/gva/bca/types/Cargo.toml b/rust-libs/modules/gva/bca/types/Cargo.toml index 1502f786939c034ee9f885cfc3b1184a96c1a3f4..8c6c10bd956a333b9cd560140dff25c0403a7f0f 100644 --- a/rust-libs/modules/gva/bca/types/Cargo.toml +++ b/rust-libs/modules/gva/bca/types/Cargo.toml @@ -6,9 +6,9 @@ license = "AGPL-3.0" edition = "2018" [dependencies] +bincode = "1.3" dubp = { version = "0.49.0" } serde = { version = "1.0.105", features = ["derive"] } -smallvec = { version = "1.4.0", features = ["serde"] } [features] default = ["duniter"] diff --git a/rust-libs/modules/gva/bca/types/src/lib.rs b/rust-libs/modules/gva/bca/types/src/lib.rs index 7b870f83958839785f2b6cae7a49fe3434d4166b..7b614366eb8f37aaf5da3a017921dd2b8df32934 100644 --- a/rust-libs/modules/gva/bca/types/src/lib.rs +++ b/rust-libs/modules/gva/bca/types/src/lib.rs @@ -25,11 +25,18 @@ pub mod prepare_payment; use crate::prepare_payment::{PrepareSimplePayment, PrepareSimplePaymentResp}; + +use bincode::Options as _; use dubp::crypto::hashs::Hash; use dubp::crypto::keys::ed25519::{PublicKey, Signature}; use dubp::wallet::prelude::*; use serde::{Deserialize, Serialize}; -//use smallvec::SmallVec; + +pub fn bincode_opts() -> impl bincode::Options { + bincode::options() + .with_limit(u32::max_value() as u64) + .allow_trailing_bytes() +} #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, Serialize)] pub enum BcaReq {