Skip to content

Commit

Permalink
Test on Debian Trixie & update RocksDB to 9.3.1
Browse files Browse the repository at this point in the history
Also bump MSRV to 1.83 for Trixie.

cherry-picked from #1125
  • Loading branch information
romanz authored and antonilol committed Dec 27, 2024
1 parent f8f0f3e commit ecc8199
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 60 deletions.
96 changes: 44 additions & 52 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build = "build.rs"
default = ["metrics", "rocksdb", "lmdb", "redb", "sled", "fjall"]
metrics = ["prometheus", "tiny_http"]
metrics_process = ["prometheus/process"]
rocksdb = ["dep:electrs-rocksdb"]
rocksdb = ["dep:rust-rocksdb"]
lmdb = ["dep:heed"]
redb = ["dep:redb"]
sled = ["dep:sled"]
Expand Down Expand Up @@ -54,8 +54,8 @@ ctrlc = "=3.4.2"
[target.'cfg(not(windows))'.dependencies]
signal-hook = "0.3"

[dependencies.electrs-rocksdb]
version = "0.19.0-e3"
[dependencies.rust-rocksdb]
version = "0.27.1"
optional = true

default-features = false
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# The maintainers of electrs are not deeply familiar with Docker, so you should DYOR.
# If you are not familiar with Docker either it's probably be safer to NOT use it.

FROM debian:bookworm-slim AS base
FROM debian:testing-slim AS base
RUN apt-get update -qqy
RUN apt-get install -qqy librocksdb-dev curl

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# The maintainers of electrs are not deeply familiar with Docker, so you should DYOR.
# If you are not familiar with Docker either it's probably be safer to NOT use it.

FROM debian:bookworm-slim as base
FROM debian:testing-slim as base
RUN apt-get update -qqy
RUN apt-get install -qqy librocksdb-dev wget

Expand Down Expand Up @@ -37,7 +37,7 @@ RUN bitcoind -version && bitcoin-cli -version
### Electrum ###
# Clone latest Electrum wallet and a few test tools
WORKDIR /build/
RUN apt-get install -qqy git libsecp256k1-1 python3-cryptography python3-setuptools python3-venv python3-pip jq curl
RUN apt-get install -qqy git libsecp256k1-2 python3-cryptography python3-setuptools python3-venv python3-pip jq curl
RUN git clone --recurse-submodules https://github.com/spesmilo/electrum/ && cd electrum/ && git log -1
RUN python3 -m venv --system-site-packages venv && \
ELECTRUM_ECC_DONT_COMPILE=1 venv/bin/pip install -e electrum/ && \
Expand Down
2 changes: 1 addition & 1 deletion examples/tx_collisions.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::{Context, Result};
use electrs_rocksdb::{ColumnFamilyDescriptor, IteratorMode, Options, DB};
use rust_rocksdb::{ColumnFamilyDescriptor, IteratorMode, Options, DB};

fn main() -> Result<()> {
let path = std::env::args().nth(1).context("missing DB path")?;
Expand Down
1 change: 1 addition & 0 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pub const ELECTRS_VERSION: &str = env!("CARGO_PKG_VERSION");
const DEFAULT_SERVER_ADDRESS: [u8; 4] = [127, 0, 0, 1]; // by default, serve on IPv4 localhost

mod internal {
#![allow(unused_imports)]
include!(concat!(env!("OUT_DIR"), "/configure_me_config.rs"));
}

Expand Down
2 changes: 1 addition & 1 deletion src/db/rocksdb.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::{Context, Result};
use electrs_rocksdb as rocksdb;
use rust_rocksdb as rocksdb;

use std::path::Path;
use std::sync::atomic::{AtomicBool, Ordering};
Expand Down

0 comments on commit ecc8199

Please sign in to comment.