From c41b561e26b601763d372e7aff9d468a00375053 Mon Sep 17 00:00:00 2001 From: fi3 Date: Tue, 10 May 2022 18:44:14 +0200 Subject: [PATCH] SpecialMerge from main --- protocols/v2/binary-sv2/binary-sv2/src/lib.rs | 4 ++-- .../no-serde-sv2/codec/src/codec/decodable.rs | 8 ++++--- .../no-serde-sv2/codec/src/codec/encodable.rs | 8 ++++--- .../no-serde-sv2/codec/src/codec/impls.rs | 14 +++++++----- .../codec/src/datatypes/copy_data_types.rs | 4 +--- .../no-serde-sv2/codec/src/datatypes/mod.rs | 6 +++-- .../datatypes/non_copy_data_types/inner.rs | 8 ++++--- .../non_copy_data_types/seq_inner.rs | 16 ++++++++------ .../binary-sv2/no-serde-sv2/codec/src/lib.rs | 16 ++++++-------- protocols/v2/codec-sv2/src/decoder.rs | 14 +++++++----- protocols/v2/codec-sv2/src/encoder.rs | 3 +-- protocols/v2/codec-sv2/src/lib.rs | 3 +-- protocols/v2/framing-sv2/src/framing2.rs | 8 +++---- protocols/v2/framing-sv2/src/header.rs | 3 +-- .../common-messages/src/setup_connection.rs | 5 +++-- .../template-distribution/src/new_template.rs | 22 +++++++++++++++++-- .../src/request_transaction_data.rs | 5 +++-- .../src/set_new_prev_hash.rs | 4 ++-- .../src/submit_solution.rs | 4 ++-- protocols/v2/sv2-ffi/src/lib.rs | 9 +++++--- protocols/v2/sv2-ffi/sv2.h | 2 +- 21 files changed, 99 insertions(+), 67 deletions(-) diff --git a/protocols/v2/binary-sv2/binary-sv2/src/lib.rs b/protocols/v2/binary-sv2/binary-sv2/src/lib.rs index 07e24ffee..daa4ec055 100644 --- a/protocols/v2/binary-sv2/binary-sv2/src/lib.rs +++ b/protocols/v2/binary-sv2/binary-sv2/src/lib.rs @@ -20,8 +20,8 @@ pub fn clone_message(_: T) -> T { pub fn u256_from_int>(value: V) -> U256<'static> { let mut u256 = vec![0_u8; 24]; let val: u64 = value.into(); - for v in val.to_le_bytes() { - u256.push(v) + for v in &(val.to_le_bytes()) { + u256.push(*v) } let u256: U256 = u256.try_into().unwrap(); u256 diff --git a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/decodable.rs b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/decodable.rs index d3e5e6829..06bc13263 100644 --- a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/decodable.rs +++ b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/decodable.rs @@ -1,6 +1,8 @@ -use crate::codec::{GetSize, SizeHint}; -use crate::datatypes::{Bytes, Signature, Sv2DataType, B016M, B0255, B032, B064K, U24, U256}; -use crate::Error; +use crate::{ + codec::{GetSize, SizeHint}, + datatypes::{Bytes, Signature, Sv2DataType, B016M, B0255, B032, B064K, U24, U256}, + Error, +}; use alloc::vec::Vec; #[cfg(not(feature = "no_std"))] use std::io::{Cursor, Read}; diff --git a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/encodable.rs b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/encodable.rs index b0ad00224..cb5e4d4c7 100644 --- a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/encodable.rs +++ b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/encodable.rs @@ -1,6 +1,8 @@ -use crate::codec::GetSize; -use crate::datatypes::{Bytes, Signature, Sv2DataType, B016M, B0255, B032, B064K, U24, U256}; -use crate::Error; +use crate::{ + codec::GetSize, + datatypes::{Bytes, Signature, Sv2DataType, B016M, B0255, B032, B064K, U24, U256}, + Error, +}; use alloc::vec::Vec; #[cfg(not(feature = "no_std"))] use std::io::{Error as E, Write}; diff --git a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/impls.rs b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/impls.rs index a025b93d7..2145c5b31 100644 --- a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/impls.rs +++ b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/codec/impls.rs @@ -1,9 +1,13 @@ -use crate::codec::decodable::{ - Decodable, DecodableField, DecodablePrimitive, FieldMarker, GetMarker, PrimitiveMarker, +use crate::{ + codec::{ + decodable::{ + Decodable, DecodableField, DecodablePrimitive, FieldMarker, GetMarker, PrimitiveMarker, + }, + encodable::{EncodableField, EncodablePrimitive}, + }, + datatypes::*, + Error, }; -use crate::codec::encodable::{EncodableField, EncodablePrimitive}; -use crate::datatypes::*; -use crate::Error; use alloc::vec::Vec; use core::convert::{TryFrom, TryInto}; diff --git a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/copy_data_types.rs b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/copy_data_types.rs index 62d23b0fa..a825cd9ce 100644 --- a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/copy_data_types.rs +++ b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/copy_data_types.rs @@ -1,7 +1,5 @@ //! Copy data types -use crate::codec::Fixed; -use crate::datatypes::Sv2DataType; -use crate::Error; +use crate::{codec::Fixed, datatypes::Sv2DataType, Error}; use core::convert::{TryFrom, TryInto}; #[cfg(not(feature = "no_std"))] diff --git a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/mod.rs b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/mod.rs index 162c0499e..573b7cd60 100644 --- a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/mod.rs +++ b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/mod.rs @@ -1,5 +1,7 @@ -use crate::codec::{GetSize, SizeHint}; -use crate::Error; +use crate::{ + codec::{GetSize, SizeHint}, + Error, +}; mod non_copy_data_types; mod copy_data_types; diff --git a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/non_copy_data_types/inner.rs b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/non_copy_data_types/inner.rs index 5bbcfea89..9af5174ed 100644 --- a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/non_copy_data_types/inner.rs +++ b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/non_copy_data_types/inner.rs @@ -1,7 +1,9 @@ use super::IntoOwned; -use crate::codec::{GetSize, SizeHint}; -use crate::datatypes::Sv2DataType; -use crate::Error; +use crate::{ + codec::{GetSize, SizeHint}, + datatypes::Sv2DataType, + Error, +}; use core::convert::TryFrom; #[cfg(not(feature = "no_std"))] diff --git a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/non_copy_data_types/seq_inner.rs b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/non_copy_data_types/seq_inner.rs index caef29d4b..5eca306f5 100644 --- a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/non_copy_data_types/seq_inner.rs +++ b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/datatypes/non_copy_data_types/seq_inner.rs @@ -1,10 +1,12 @@ -use crate::codec::decodable::{Decodable, DecodableField, FieldMarker, GetMarker, PrimitiveMarker}; -use crate::codec::encodable::{EncodableField, EncodablePrimitive}; -use crate::codec::Fixed; -use crate::codec::GetSize; -use crate::datatypes::Sv2DataType; -use crate::datatypes::*; -use crate::Error; +use crate::{ + codec::{ + decodable::{Decodable, DecodableField, FieldMarker, GetMarker, PrimitiveMarker}, + encodable::{EncodableField, EncodablePrimitive}, + Fixed, GetSize, + }, + datatypes::{Sv2DataType, *}, + Error, +}; use core::marker::PhantomData; // TODO add test for that implement also with serde!!!! diff --git a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/lib.rs b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/lib.rs index b5951986d..97fb6b22f 100644 --- a/protocols/v2/binary-sv2/no-serde-sv2/codec/src/lib.rs +++ b/protocols/v2/binary-sv2/no-serde-sv2/codec/src/lib.rs @@ -33,10 +33,11 @@ pub use datatypes::{ U256, }; -pub use crate::codec::decodable::Decodable; -pub use crate::codec::encodable::{Encodable, EncodableField}; -pub use crate::codec::GetSize; -pub use crate::codec::SizeHint; +pub use crate::codec::{ + decodable::Decodable, + encodable::{Encodable, EncodableField}, + GetSize, SizeHint, +}; #[allow(clippy::wrong_self_convention)] pub fn to_bytes(src: T) -> Result, Error> { @@ -56,15 +57,12 @@ pub fn from_bytes<'a, T: Decodable<'a>>(data: &'a mut [u8]) -> Result } pub mod decodable { - pub use crate::codec::decodable::Decodable; - pub use crate::codec::decodable::DecodableField; - pub use crate::codec::decodable::FieldMarker; + pub use crate::codec::decodable::{Decodable, DecodableField, FieldMarker}; //pub use crate::codec::decodable::PrimitiveMarker; } pub mod encodable { - pub use crate::codec::encodable::Encodable; - pub use crate::codec::encodable::EncodableField; + pub use crate::codec::encodable::{Encodable, EncodableField}; } #[macro_use] diff --git a/protocols/v2/codec-sv2/src/decoder.rs b/protocols/v2/codec-sv2/src/decoder.rs index 38363b3fd..5ba7cb5da 100644 --- a/protocols/v2/codec-sv2/src/decoder.rs +++ b/protocols/v2/codec-sv2/src/decoder.rs @@ -4,15 +4,19 @@ use binary_sv2::Deserialize; use binary_sv2::GetSize; use binary_sv2::Serialize; use core::marker::PhantomData; -use framing_sv2::framing2::{EitherFrame, Frame as F_, Sv2Frame}; #[cfg(feature = "noise_sv2")] use framing_sv2::framing2::{HandShakeFrame, NoiseFrame}; -use framing_sv2::header::Header; #[cfg(feature = "noise_sv2")] use framing_sv2::header::NoiseHeader; - -use crate::buffer::{Buffer, SlowAndCorrect}; -use crate::error::{Error, Result}; +use framing_sv2::{ + framing2::{EitherFrame, Frame as F_, Sv2Frame}, + header::Header, +}; + +use crate::{ + buffer::{Buffer, SlowAndCorrect}, + error::{Error, Result}, +}; #[cfg(feature = "noise_sv2")] use crate::{State, TransportMode}; diff --git a/protocols/v2/codec-sv2/src/encoder.rs b/protocols/v2/codec-sv2/src/encoder.rs index d87cf3d2d..055c45a7a 100644 --- a/protocols/v2/codec-sv2/src/encoder.rs +++ b/protocols/v2/codec-sv2/src/encoder.rs @@ -1,6 +1,5 @@ use alloc::vec::Vec; -use binary_sv2::GetSize; -use binary_sv2::Serialize; +use binary_sv2::{GetSize, Serialize}; #[cfg(feature = "noise_sv2")] use core::cmp::min; #[cfg(feature = "noise_sv2")] diff --git a/protocols/v2/codec-sv2/src/lib.rs b/protocols/v2/codec-sv2/src/lib.rs index 70047e5eb..d8ade052f 100644 --- a/protocols/v2/codec-sv2/src/lib.rs +++ b/protocols/v2/codec-sv2/src/lib.rs @@ -12,8 +12,7 @@ mod error; pub use error::Error; -pub use decoder::StandardEitherFrame; -pub use decoder::StandardSv2Frame; +pub use decoder::{StandardEitherFrame, StandardSv2Frame}; pub use decoder::StandardDecoder; #[cfg(feature = "noise_sv2")] diff --git a/protocols/v2/framing-sv2/src/framing2.rs b/protocols/v2/framing-sv2/src/framing2.rs index c309e77b3..4fc63655b 100644 --- a/protocols/v2/framing-sv2/src/framing2.rs +++ b/protocols/v2/framing-sv2/src/framing2.rs @@ -1,8 +1,6 @@ -use crate::header::Header; -use crate::header::NoiseHeader; +use crate::header::{Header, NoiseHeader}; use alloc::vec::Vec; -use binary_sv2::Serialize; -use binary_sv2::{to_writer, GetSize}; +use binary_sv2::{to_writer, GetSize, Serialize}; use core::convert::TryFrom; const NOISE_MAX_LEN: usize = const_sv2::NOISE_FRAME_MAX_SIZE; @@ -57,7 +55,7 @@ pub trait Frame<'a, T: Serialize + GetSize>: Sized { ) -> Option; } -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct Sv2Frame { header: Header, payload: Option, diff --git a/protocols/v2/framing-sv2/src/header.rs b/protocols/v2/framing-sv2/src/header.rs index 22762a048..c47c12ea8 100644 --- a/protocols/v2/framing-sv2/src/header.rs +++ b/protocols/v2/framing-sv2/src/header.rs @@ -2,8 +2,7 @@ use alloc::vec::Vec; #[cfg(not(feature = "with_serde"))] use binary_sv2::binary_codec_sv2; -use binary_sv2::U24; -use binary_sv2::{Deserialize, Serialize}; +use binary_sv2::{Deserialize, Serialize, U24}; use core::convert::TryInto; #[derive(Debug, Serialize, Deserialize, Copy, Clone)] diff --git a/protocols/v2/subprotocols/common-messages/src/setup_connection.rs b/protocols/v2/subprotocols/common-messages/src/setup_connection.rs index 880ae0aa4..0f38b83c4 100644 --- a/protocols/v2/subprotocols/common-messages/src/setup_connection.rs +++ b/protocols/v2/subprotocols/common-messages/src/setup_connection.rs @@ -1,12 +1,11 @@ #[cfg(not(feature = "with_serde"))] use alloc::vec::Vec; -use binary_sv2::Str0255; #[cfg(not(feature = "with_serde"))] use binary_sv2::{ binary_codec_sv2, binary_codec_sv2::CVec, decodable::DecodableField, decodable::FieldMarker, free_vec, Error, GetSize, }; -use binary_sv2::{Deserialize, Serialize}; +use binary_sv2::{Deserialize, Serialize, Str0255}; use const_sv2::{ SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT, SV2_JOB_NEG_PROTOCOL_DISCRIMINANT, SV2_MINING_PROTOCOL_DISCRIMINANT, SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT, @@ -129,6 +128,7 @@ pub struct CSetupConnection { #[cfg(not(feature = "with_serde"))] impl<'a> CSetupConnection { #[cfg(not(feature = "with_serde"))] + #[allow(clippy::wrong_self_convention)] pub fn to_rust_rep_mut(&'a mut self) -> Result, Error> { let endpoint_host: Str0255 = self.endpoint_host.as_mut_slice().try_into()?; let vendor: Str0255 = self.vendor.as_mut_slice().try_into()?; @@ -236,6 +236,7 @@ pub struct CSetupConnectionError { #[cfg(not(feature = "with_serde"))] impl<'a> CSetupConnectionError { #[cfg(not(feature = "with_serde"))] + #[allow(clippy::wrong_self_convention)] pub fn to_rust_rep_mut(&'a mut self) -> Result, Error> { let error_code: Str0255 = self.error_code.as_mut_slice().try_into()?; diff --git a/protocols/v2/subprotocols/template-distribution/src/new_template.rs b/protocols/v2/subprotocols/template-distribution/src/new_template.rs index 15c15eac0..03ee81720 100644 --- a/protocols/v2/subprotocols/template-distribution/src/new_template.rs +++ b/protocols/v2/subprotocols/template-distribution/src/new_template.rs @@ -4,8 +4,7 @@ use alloc::vec::Vec; use binary_sv2::binary_codec_sv2::{self, free_vec, free_vec_2, CVec, CVec2}; #[cfg(not(feature = "with_serde"))] use binary_sv2::Error; -use binary_sv2::{Deserialize, Serialize}; -use binary_sv2::{Seq0255, B0255, B064K, U256}; +use binary_sv2::{Deserialize, Seq0255, Serialize, B0255, B064K, U256}; #[cfg(not(feature = "with_serde"))] use core::convert::TryInto; @@ -54,6 +53,24 @@ pub struct NewTemplate<'decoder> { pub merkle_path: Seq0255<'decoder, U256<'decoder>>, } +impl<'a> NewTemplate<'a> { + pub fn as_static(&self) -> NewTemplate<'static> { + NewTemplate { + template_id: self.template_id, + future_template: self.future_template, + version: self.version, + coinbase_tx_version: self.coinbase_tx_version, + coinbase_prefix: self.coinbase_prefix.clone().into_static(), + coinbase_tx_input_sequence: self.coinbase_tx_input_sequence, + coinbase_tx_value_remaining: self.coinbase_tx_value_remaining, + coinbase_tx_outputs_count: self.coinbase_tx_outputs_count, + coinbase_tx_outputs: self.coinbase_tx_outputs.clone().into_static(), + coinbase_tx_locktime: self.coinbase_tx_locktime, + merkle_path: self.merkle_path.clone().into_static(), + } + } +} + #[repr(C)] #[cfg(not(feature = "with_serde"))] pub struct CNewTemplate { @@ -107,6 +124,7 @@ impl<'a> From> for CNewTemplate { #[cfg(not(feature = "with_serde"))] impl<'a> CNewTemplate { #[cfg(not(feature = "with_serde"))] + #[allow(clippy::wrong_self_convention)] pub fn to_rust_rep_mut(&'a mut self) -> Result, Error> { let coinbase_prefix: B0255 = self.coinbase_prefix.as_mut_slice().try_into()?; let coinbase_tx_outputs: B064K = self.coinbase_tx_outputs.as_mut_slice().try_into()?; diff --git a/protocols/v2/subprotocols/template-distribution/src/request_transaction_data.rs b/protocols/v2/subprotocols/template-distribution/src/request_transaction_data.rs index 987bb86ca..d2a3a82e1 100644 --- a/protocols/v2/subprotocols/template-distribution/src/request_transaction_data.rs +++ b/protocols/v2/subprotocols/template-distribution/src/request_transaction_data.rs @@ -4,8 +4,7 @@ use alloc::vec::Vec; use binary_sv2::binary_codec_sv2::{self, free_vec, free_vec_2, CVec, CVec2}; #[cfg(not(feature = "with_serde"))] use binary_sv2::Error; -use binary_sv2::{Deserialize, Serialize}; -use binary_sv2::{Seq064K, Str0255, B016M, B064K}; +use binary_sv2::{Deserialize, Seq064K, Serialize, Str0255, B016M, B064K}; #[cfg(not(feature = "with_serde"))] use core::convert::TryInto; @@ -70,6 +69,7 @@ pub struct CRequestTransactionDataSuccess { #[cfg(not(feature = "with_serde"))] impl<'a> CRequestTransactionDataSuccess { #[cfg(not(feature = "with_serde"))] + #[allow(clippy::wrong_self_convention)] pub fn to_rust_rep_mut(&'a mut self) -> Result, Error> { let excess_data: B064K = self.excess_data.as_mut_slice().try_into()?; let transaction_list_ = self.transaction_list.as_mut_slice(); @@ -132,6 +132,7 @@ pub struct CRequestTransactionDataError { #[cfg(not(feature = "with_serde"))] impl<'a> CRequestTransactionDataError { #[cfg(not(feature = "with_serde"))] + #[allow(clippy::wrong_self_convention)] pub fn to_rust_rep_mut(&'a mut self) -> Result, Error> { let error_code: Str0255 = self.error_code.as_mut_slice().try_into()?; Ok(RequestTransactionDataError { diff --git a/protocols/v2/subprotocols/template-distribution/src/set_new_prev_hash.rs b/protocols/v2/subprotocols/template-distribution/src/set_new_prev_hash.rs index 055ee4d19..7f28ba0b9 100644 --- a/protocols/v2/subprotocols/template-distribution/src/set_new_prev_hash.rs +++ b/protocols/v2/subprotocols/template-distribution/src/set_new_prev_hash.rs @@ -4,8 +4,7 @@ use alloc::vec::Vec; use binary_sv2::binary_codec_sv2::{self, free_vec, CVec}; #[cfg(not(feature = "with_serde"))] use binary_sv2::Error; -use binary_sv2::U256; -use binary_sv2::{Deserialize, Serialize}; +use binary_sv2::{Deserialize, Serialize, U256}; #[cfg(not(feature = "with_serde"))] use core::convert::TryInto; @@ -49,6 +48,7 @@ pub struct CSetNewPrevHash { #[cfg(not(feature = "with_serde"))] impl<'a> CSetNewPrevHash { #[cfg(not(feature = "with_serde"))] + #[allow(clippy::wrong_self_convention)] pub fn to_rust_rep_mut(&'a mut self) -> Result, Error> { let prev_hash: U256 = self.prev_hash.as_mut_slice().try_into()?; let target: U256 = self.target.as_mut_slice().try_into()?; diff --git a/protocols/v2/subprotocols/template-distribution/src/submit_solution.rs b/protocols/v2/subprotocols/template-distribution/src/submit_solution.rs index af78ff53d..f011a3b76 100644 --- a/protocols/v2/subprotocols/template-distribution/src/submit_solution.rs +++ b/protocols/v2/subprotocols/template-distribution/src/submit_solution.rs @@ -4,8 +4,7 @@ use alloc::vec::Vec; use binary_sv2::binary_codec_sv2::{self, free_vec, CVec}; #[cfg(not(feature = "with_serde"))] use binary_sv2::Error; -use binary_sv2::B064K; -use binary_sv2::{Deserialize, Serialize}; +use binary_sv2::{Deserialize, Serialize, B064K}; #[cfg(not(feature = "with_serde"))] use core::convert::TryInto; @@ -48,6 +47,7 @@ pub struct CSubmitSolution { #[cfg(not(feature = "with_serde"))] impl<'a> CSubmitSolution { #[cfg(not(feature = "with_serde"))] + #[allow(clippy::wrong_self_convention)] pub fn to_rust_rep_mut(&'a mut self) -> Result, Error> { let coinbase_tx: B064K = self.coinbase_tx.as_mut_slice().try_into()?; diff --git a/protocols/v2/sv2-ffi/src/lib.rs b/protocols/v2/sv2-ffi/src/lib.rs index c7b027baf..a0323477d 100644 --- a/protocols/v2/sv2-ffi/src/lib.rs +++ b/protocols/v2/sv2-ffi/src/lib.rs @@ -12,8 +12,10 @@ use template_distribution_sv2::{ }; use binary_sv2::{ - binary_codec_sv2::CVec, decodable::DecodableField, decodable::FieldMarker, - encodable::EncodableField, from_bytes, Deserialize, Error, + binary_codec_sv2::CVec, + decodable::{DecodableField, FieldMarker}, + encodable::EncodableField, + from_bytes, Deserialize, Error, }; use const_sv2::{ @@ -144,6 +146,7 @@ impl<'a> From> for CSv2Message { } impl<'a> CSv2Message { + #[allow(clippy::wrong_self_convention)] pub fn to_rust_rep_mut(&'a mut self) -> Result, Error> { match self { CSv2Message::NewTemplate(v) => Ok(Sv2Message::NewTemplate(v.to_rust_rep_mut()?)), @@ -309,7 +312,7 @@ pub extern "C" fn new_encoder() -> *mut EncoderWrapper { #[no_mangle] #[allow(clippy::not_unsafe_ptr_arg_deref)] -pub extern "C" fn free_encoder(encoder: *mut EncoderWrapper) { +pub extern "C" fn flush_encoder(encoder: *mut EncoderWrapper) { let mut encoder = unsafe { Box::from_raw(encoder) }; encoder.free = true; Box::into_raw(encoder); diff --git a/protocols/v2/sv2-ffi/sv2.h b/protocols/v2/sv2-ffi/sv2.h index 82abe0c0e..47503aa8f 100644 --- a/protocols/v2/sv2-ffi/sv2.h +++ b/protocols/v2/sv2-ffi/sv2.h @@ -535,7 +535,7 @@ bool is_ok(const CResult *cresult); EncoderWrapper *new_encoder(); -void free_encoder(EncoderWrapper *encoder); +void flush_encoder(EncoderWrapper *encoder); void free_decoder(DecoderWrapper *decoder);