From 40263b425e49d979216a42ab78a42e8522ba1088 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Mon, 13 Mar 2023 14:57:26 -0400 Subject: [PATCH] Remove deprecated bdk-ffi-bindgen tool --- Cargo.toml | 6 +- bdk-ffi-bindgen/Cargo.toml | 10 --- bdk-ffi-bindgen/src/main.rs | 138 ------------------------------------ 3 files changed, 3 insertions(+), 151 deletions(-) delete mode 100644 bdk-ffi-bindgen/Cargo.toml delete mode 100644 bdk-ffi-bindgen/src/main.rs diff --git a/Cargo.toml b/Cargo.toml index b8d84b0..f36d6b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] -members = ["bdk-ffi", "bdk-ffi-bindgen"] -default-members = ["bdk-ffi", "bdk-ffi-bindgen"] +members = ["bdk-ffi"] +default-members = ["bdk-ffi"] exclude = ["api-docs", "bdk-android", "bdk-jvm", "bdk-python", "bdk-swift"] [profile.release-smaller] @@ -9,4 +9,4 @@ opt-level = 'z' # Optimize for size. lto = true # Enable Link Time Optimization codegen-units = 1 # Reduce number of codegen units to increase optimizations. panic = 'abort' # Abort on panic -strip = true # Strip symbols from binary* \ No newline at end of file +strip = true # Strip symbols from binary* diff --git a/bdk-ffi-bindgen/Cargo.toml b/bdk-ffi-bindgen/Cargo.toml deleted file mode 100644 index 87ee0bc..0000000 --- a/bdk-ffi-bindgen/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "bdk-ffi-bindgen" -version = "0.2.0" -edition = "2021" - -[dependencies] -anyhow = "1.0.45" # remove after upgrading to next version of uniffi -structopt = "0.3" -uniffi_bindgen = "0.21.0" -camino = "1.0.9" diff --git a/bdk-ffi-bindgen/src/main.rs b/bdk-ffi-bindgen/src/main.rs deleted file mode 100644 index 8a87fc5..0000000 --- a/bdk-ffi-bindgen/src/main.rs +++ /dev/null @@ -1,138 +0,0 @@ -use camino::Utf8Path; -use std::fmt; -use std::path::{Path, PathBuf}; -use std::str::FromStr; -use structopt::StructOpt; - -#[derive(Debug, Eq, PartialEq)] -pub enum Language { - Kotlin, - Python, - Swift, -} - -impl fmt::Display for Language { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match self { - Language::Kotlin => write!(f, "kotlin"), - Language::Swift => write!(f, "swift"), - Language::Python => write!(f, "python"), - } - } -} - -#[derive(Debug)] -pub enum Error { - UnsupportedLanguage, -} - -impl fmt::Display for Error { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "{:?}", self) - } -} - -impl FromStr for Language { - type Err = Error; - fn from_str(s: &str) -> Result { - match s { - "kotlin" => Ok(Language::Kotlin), - "python" => Ok(Language::Python), - "swift" => Ok(Language::Swift), - _ => Err(Error::UnsupportedLanguage), - } - } -} - -fn generate_bindings(opt: &Opt) -> anyhow::Result<(), anyhow::Error> { - let path: &Utf8Path = Utf8Path::from_path(&opt.udl_file).unwrap(); - let out_dir: &Utf8Path = Utf8Path::from_path(&opt.out_dir).unwrap(); - uniffi_bindgen::generate_bindings( - path, - None, - vec![opt.language.to_string().as_str()], - Some(out_dir), - None, - false, - )?; - - Ok(()) -} - -fn fixup_python_lib_path( - out_dir: &Path, - lib_name: &Path, -) -> Result<(), Box> { - use std::fs; - use std::io::Write; - - const LOAD_INDIRECT_DEF: &str = "def loadIndirect():"; - - let bindings_file = out_dir.join("bdk.py"); - let mut data = fs::read_to_string(&bindings_file)?; - - let pos = data - .find(LOAD_INDIRECT_DEF) - .unwrap_or_else(|| panic!("loadIndirect not found in `{}`", bindings_file.display())); - let range = pos..pos + LOAD_INDIRECT_DEF.len(); - - let replacement = format!( - r#" -def loadIndirect(): - import glob - return getattr(ctypes.cdll, glob.glob(os.path.join(os.path.dirname(os.path.abspath(__file__)), '{}.*'))[0]) - -def _loadIndirectOld():"#, - &lib_name.to_str().expect("lib name") - ); - data.replace_range(range, &replacement); - - let mut file = fs::OpenOptions::new() - .write(true) - .truncate(true) - .open(&bindings_file)?; - file.write_all(data.as_bytes())?; - - Ok(()) -} - -#[derive(Debug, StructOpt)] -#[structopt( - name = "bdk-ffi-bindgen", - about = "A tool to generate bdk-ffi language bindings" -)] -struct Opt { - /// UDL file - #[structopt(env = "BDKFFI_BINDGEN_UDL", short, long, default_value("src/bdk.udl"), parse(try_from_str = PathBuf::from_str))] - udl_file: PathBuf, - - /// Language to generate bindings for - #[structopt(env = "BDKFFI_BINDGEN_LANGUAGE", short, long, possible_values(&["kotlin","swift","python"]), parse(try_from_str = Language::from_str))] - language: Language, - - /// Output directory to put generated language bindings - #[structopt(env = "BDKFFI_BINDGEN_OUTPUT_DIR", short, long, parse(try_from_str = PathBuf::from_str))] - out_dir: PathBuf, - - /// Python fix up lib path - #[structopt(env = "BDKFFI_BINDGEN_PYTHON_FIXUP_PATH", short, long, parse(try_from_str = PathBuf::from_str))] - python_fixup_path: Option, -} - -fn main() -> Result<(), Box> { - let opt = Opt::from_args(); - - println!("Input UDL file is {:?}", opt.udl_file); - println!("Chosen language is {}", opt.language); - println!("Output directory is {:?}", opt.out_dir); - - generate_bindings(&opt)?; - - if opt.language == Language::Python { - if let Some(path) = opt.python_fixup_path { - println!("Fixing up python lib path, {:?}", &path); - fixup_python_lib_path(&opt.out_dir, &path)?; - } - } - Ok(()) -}