Skip to content

Commit 7c330b6

Browse files
committed
chore: update inferadb-common-storage-ledger config
1 parent f4a683a commit 7c330b6

File tree

4 files changed

+37
-19
lines changed

4 files changed

+37
-19
lines changed

crates/api/tests/ledger_integration.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ use axum::{
3939
middleware::{self, Next},
4040
response::Response,
4141
};
42-
use inferadb_common_storage_ledger::{LedgerBackend, LedgerBackendConfig};
42+
use inferadb_common_storage_ledger::{
43+
ClientConfig, LedgerBackend, LedgerBackendConfig, ServerSource,
44+
};
4345
use inferadb_engine_api::AppState;
4446
use inferadb_engine_config::Config;
4547
use inferadb_engine_core::ipl::{RelationDef, RelationExpr, Schema, TypeDef};
@@ -110,13 +112,16 @@ fn create_test_config() -> Config {
110112

111113
async fn create_ledger_backend() -> LedgerBackend {
112114
let vault_id = unique_vault_id();
113-
let config = LedgerBackendConfig::builder()
114-
.endpoints(vec![ledger_endpoint()])
115+
let client_config = ClientConfig::builder()
116+
.servers(ServerSource::from_static([ledger_endpoint()]))
115117
.client_id(format!("engine-test-{}", vault_id))
118+
.build()
119+
.expect("valid client config");
120+
let config = LedgerBackendConfig::builder()
121+
.client(client_config)
116122
.namespace_id(ledger_namespace_id())
117123
.vault_id(vault_id)
118-
.build()
119-
.expect("valid config");
124+
.build();
120125

121126
LedgerBackend::new(config).await.expect("backend creation should succeed")
122127
}

crates/auth/tests/signing_key_cache_ledger_integration.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use chrono::Utc;
2020
use ed25519_dalek::SigningKey;
2121
use inferadb_common_storage::auth::{PublicSigningKey, PublicSigningKeyStore};
2222
use inferadb_common_storage_ledger::{
23-
LedgerBackend, LedgerBackendConfig, auth::LedgerSigningKeyStore,
23+
ClientConfig, LedgerBackend, LedgerBackendConfig, ServerSource, auth::LedgerSigningKeyStore,
2424
};
2525
use inferadb_engine_auth::SigningKeyCache;
2626
use rand_core::OsRng;
@@ -74,12 +74,15 @@ fn create_test_key(kid: &str, client_id: i64) -> PublicSigningKey {
7474

7575
/// Create a `LedgerSigningKeyStore` for testing.
7676
async fn create_key_store() -> Arc<dyn PublicSigningKeyStore> {
77-
let config = LedgerBackendConfig::builder()
78-
.endpoints(vec![ledger_endpoint()])
77+
let client_config = ClientConfig::builder()
78+
.servers(ServerSource::from_static([ledger_endpoint()]))
7979
.client_id(format!("test-cache-{}", unique_namespace_id()))
80-
.namespace_id(1) // Namespace is specified per-operation, not here
8180
.build()
82-
.expect("valid config");
81+
.expect("valid client config");
82+
let config = LedgerBackendConfig::builder()
83+
.client(client_config)
84+
.namespace_id(1) // Namespace is specified per-operation, not here
85+
.build();
8386

8487
let backend = LedgerBackend::new(config).await.expect("backend creation should succeed");
8588

crates/engine/src/main.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ use std::sync::Arc;
77
use anyhow::Result;
88
use clap::Parser;
99
use inferadb_common_storage::MemoryBackend;
10-
use inferadb_common_storage_ledger::{LedgerBackend, LedgerBackendConfig};
10+
use inferadb_common_storage_ledger::{
11+
ClientConfig, LedgerBackend, LedgerBackendConfig, ServerSource,
12+
};
1113
use inferadb_engine_auth::SigningKeyCache;
1214
use inferadb_engine_config::load_or_default;
1315
use inferadb_engine_core::ipl::{Schema, parse_schema};
@@ -158,13 +160,16 @@ async fn main() -> Result<()> {
158160
.ledger
159161
.namespace_id
160162
.ok_or_else(|| anyhow::anyhow!("Ledger namespace_id is required"))?;
161-
let ledger_config = LedgerBackendConfig::builder()
162-
.endpoints(vec![endpoint])
163+
let client_config = ClientConfig::builder()
164+
.servers(ServerSource::from_static([endpoint]))
163165
.client_id(client_id)
166+
.build()
167+
.map_err(|e| anyhow::anyhow!("Failed to build Ledger client config: {}", e))?;
168+
let ledger_config = LedgerBackendConfig::builder()
169+
.client(client_config)
164170
.namespace_id(namespace_id)
165171
.maybe_vault_id(config.ledger.vault_id)
166-
.build()
167-
.map_err(|e| anyhow::anyhow!("Failed to build Ledger config: {}", e))?;
172+
.build();
168173
let ledger_backend = LedgerBackend::new(ledger_config)
169174
.await
170175
.map_err(|e| anyhow::anyhow!("Failed to connect to Ledger: {}", e))?;

crates/store/src/factory.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,18 @@
1616
//! let store: Arc<dyn InferaStore> = Arc::new(EngineStorage::builder().backend(MemoryBackend::new()).build());
1717
//!
1818
//! // Ledger backend
19-
//! use inferadb_common_storage_ledger::{LedgerBackend, LedgerBackendConfig};
19+
//! use inferadb_common_storage_ledger::{
20+
//! ClientConfig, LedgerBackend, LedgerBackendConfig, ServerSource,
21+
//! };
2022
//!
21-
//! let config = LedgerBackendConfig::builder()
22-
//! .endpoints(vec!["http://localhost:50051".to_string()])
23+
//! let client = ClientConfig::builder()
24+
//! .servers(ServerSource::from_static(["http://localhost:50051"]))
2325
//! .client_id("my-service")
24-
//! .namespace_id(1)
2526
//! .build()?;
27+
//! let config = LedgerBackendConfig::builder()
28+
//! .client(client)
29+
//! .namespace_id(1)
30+
//! .build();
2631
//! let backend = LedgerBackend::new(config).await?;
2732
//! let store: Arc<dyn InferaStore> = Arc::new(EngineStorage::builder().backend(backend).build());
2833
//! ```

0 commit comments

Comments
 (0)