chore: cleanup, remove ferment

Author: Syn-McJ

Cargo.lock

@@ -13,15 +13,12 @@ test-helpers = []
 
 [dependencies]
 dash-spv-masternode-processor = { path = "../dash-spv-masternode-processor" }
-ferment-interfaces = { path = "../../ferment/ferment-interfaces" }
-ferment-macro = { path = "../../ferment/ferment-macro" }
 logging = { path = "../logging" }
 byte = "0.2"
 tracing = "0.1.40"
 
 [build-dependencies]
 cbindgen = "0.24.3"
-ferment = { path = "../../ferment/ferment" }
 
 [lib]
 name = "dash_spv_coinjoin"

dash-spv-coinjoin/Cargo.toml

@@ -1,18 +1,19 @@
 extern crate cbindgen;
-extern crate ferment;
 
-use std::process::Command;
+use std::env;
 
 fn main() {
-    match ferment::Builder::new()
-        .with_crates(vec![])
-        .generate() {
-        Ok(()) => match Command::new("cbindgen")
-            .args(&["--config", "cbindgen.toml", "-o", "target/example.h"])
-            .status() {
-            Ok(status) => println!("Bindings generated into target/example.h with status: {status}"),
-            Err(err) => panic!("Can't generate bindings: {}", err)
-        }
-        Err(err) => panic!("Can't create FFI expansion: {}", err)
-    }
+    let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+    let mut config = cbindgen::Config::from_file("./cbindgen.toml").expect("Error config");
+    let includes = vec![];
+    config.language = cbindgen::Language::C;
+    config.parse = cbindgen::ParseConfig {
+        parse_deps: true,
+        include: Some(includes.clone()),
+        extra_bindings: includes,
+        ..Default::default()
+    };
+    cbindgen::generate_with_config(&crate_dir, config)
+        .unwrap()
+        .write_to_file("target/dash_spv_coinjoin.h");
 }

dash-spv-coinjoin/build.rs

@@ -4,10 +4,10 @@ use dash_spv_masternode_processor::chain::common::ChainType;
 use dash_spv_masternode_processor::chain::params::DUFFS;
 use dash_spv_masternode_processor::common::Block;
 use dash_spv_masternode_processor::crypto::byte_util::UInt256;
+use dash_spv_masternode_processor::ffi::boxer::boxed;
 use dash_spv_masternode_processor::ffi::unboxer::unbox_any;
 use dash_spv_masternode_processor::tx::transaction::Transaction;
 use dash_spv_masternode_processor::util::script::ScriptType;
-use ferment_interfaces::boxed;
 use logging::*;
 use tracing::{info, warn, debug};
 use crate::ffi::callbacks::{GetInputValueByPrevoutHash, HasChainLock, DestroyInputValue};
@@ -19,7 +19,6 @@ use crate::constants::COINJOIN_ENTRY_MAX_SIZE;
 use crate::utils::coin_format::CoinFormat;
 
 #[derive(Debug)]
-// #[ferment_macro::export]
 pub struct CoinJoin {
     pub opaque_context: *const std::ffi::c_void,
     pub get_input_value_by_prevout_hash: GetInputValueByPrevoutHash,

dash-spv-coinjoin/src/coinjoin.rs

@@ -1,6 +1,5 @@
 use std::collections::HashMap;
-use dash_spv_masternode_processor::{common::SocketAddress, crypto::UInt256, ffi::{from::FromFFI, unboxer::unbox_any}, models::MasternodeEntry};
-use ferment_interfaces::boxed;
+use dash_spv_masternode_processor::{common::SocketAddress, crypto::UInt256, ffi::{boxer::boxed, from::FromFFI, unboxer::unbox_any}, models::MasternodeEntry};
 use std::time::{SystemTime, UNIX_EPOCH};
 use tracing::{debug, info, warn};
 use logging::*;

dash-spv-coinjoin/src/coinjoin_client_queue_manager.rs

@@ -1,6 +1,5 @@
 #[repr(C)]
 #[derive(Clone, Debug)]
-#[ferment_macro::export]
 pub struct InputValue {
     pub is_valid: bool,
     pub value: u64,

dash-spv-coinjoin/src/fermented.rs

@@ -7,7 +7,6 @@ use crate::messages::coinjoin_message::CoinJoinMessageType;
 // dsa
 #[repr(C)]
 #[derive(Clone, Debug)]
-#[ferment_macro::export]
 pub struct CoinJoinAcceptMessage {
     pub denomination: u32,
     pub tx_collateral: Transaction,

dash-spv-coinjoin/src/ffi/input_value.rs

@@ -14,7 +14,6 @@ use crate::messages::coinjoin_message::CoinJoinMessageType;
 // dstx
 // #[repr(C)]
 #[derive(Clone, Debug)]
-// #[ferment_macro::export]
 pub struct CoinJoinBroadcastTx {
     pub tx: Transaction,
     pub pro_tx_hash: UInt256,

dash-spv-coinjoin/src/messages/coinjoin_accept_message.rs

@@ -6,7 +6,6 @@ use crate::messages::coinjoin_message::CoinJoinMessageType;
 // dsc
 #[repr(C)]
 #[derive(Clone, Debug)]
-#[ferment_macro::export]
 pub struct CoinJoinCompleteMessage {
     pub msg_session_id: i32,
     pub msg_message_id: PoolMessage,