Skip to content

Commit

Permalink
update from 1_80 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
yeastplume committed Aug 27, 2024
2 parents 93464a8 + d022f26 commit 0b24640
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 40 deletions.
File renamed without changes.
43 changes: 10 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
######

[build-dependencies]
built = { version = "0.4", features = ["git2"]}
built = { version = "0.7", features = ["git2"]}

[dev-dependencies]
url = "2.1"
Expand Down
2 changes: 1 addition & 1 deletion impls/src/adapters/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub mod http;
mod slatepack;

pub use self::file::PathToSlate;
pub use self::http::{HttpSlateSender, SchemeNotHttp};
pub use self::http::HttpSlateSender;
pub use self::slatepack::PathToSlatepack;

use crate::config::WalletConfig;
Expand Down
2 changes: 1 addition & 1 deletion impls/src/node_clients/resp_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// Derived from https://github.com/apoelstra/rust-jsonrpc

//! JSON RPC Types for V2 node client
#[allow(dead_code)]
#[derive(Debug, Deserialize)]
pub struct GetTipResp {
pub height: u64,
Expand Down
5 changes: 1 addition & 4 deletions src/build/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,10 @@ fn main() {
}

// build and versioning information
let mut opts = built::Options::default();
opts.set_dependencies(true);
let out_dir_path = format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs");
// don't fail the build if something's missing, may just be cargo release
let _ = built::write_built_file_with_opts(
&opts,
Path::new(env!("CARGO_MANIFEST_DIR")),
Some(Path::new(env!("CARGO_MANIFEST_DIR"))),
Path::new(&out_dir_path),
);
}

0 comments on commit 0b24640

Please sign in to comment.