From 6db1d81bf9b69f99c37f976f643126b189cb5716 Mon Sep 17 00:00:00 2001 From: bryan newbold Date: Sun, 19 Feb 2023 15:08:45 -0800 Subject: pds: update to use 'adenosine' crate --- adenosine-pds/Cargo.toml | 2 +- adenosine-pds/src/bsky.rs | 2 +- adenosine-pds/src/crypto.rs | 2 +- adenosine-pds/src/lib.rs | 4 ++-- adenosine-pds/src/repo.rs | 2 +- adenosine-pds/src/web.rs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adenosine-pds/Cargo.toml b/adenosine-pds/Cargo.toml index 88262b8..482a812 100644 --- a/adenosine-pds/Cargo.toml +++ b/adenosine-pds/Cargo.toml @@ -29,7 +29,7 @@ rusqlite_migration = "1" rouille = "3" # NOTE: vendored for now #iroh-car = "*" -adenosine-cli = { version = "0.2.0", path = "../adenosine-cli" } +adenosine = { version = "0.2.0", path = "../adenosine" } tokio = { version = "1", features = ["full"] } futures = "0.3" sha256 = "1" diff --git a/adenosine-pds/src/bsky.rs b/adenosine-pds/src/bsky.rs index db6353a..e966504 100644 --- a/adenosine-pds/src/bsky.rs +++ b/adenosine-pds/src/bsky.rs @@ -6,7 +6,7 @@ use crate::{ ipld_into_json_value, json_value_into_ipld, AtpDatabase, AtpService, Did, Result, Tid, XrpcError, }; -use adenosine_cli::identifiers::{AtUri, DidOrHost, Nsid}; +use adenosine::identifiers::{AtUri, DidOrHost, Nsid}; use anyhow::anyhow; use libipld::Cid; use rusqlite::params; diff --git a/adenosine-pds/src/crypto.rs b/adenosine-pds/src/crypto.rs index e10401a..adf4e02 100644 --- a/adenosine-pds/src/crypto.rs +++ b/adenosine-pds/src/crypto.rs @@ -1,5 +1,5 @@ use crate::P256KeyMaterial; -use adenosine_cli::identifiers::Did; +use adenosine::identifiers::Did; use anyhow::{anyhow, ensure, Result}; use p256::ecdsa::signature::{Signer, Verifier}; use std::str::FromStr; diff --git a/adenosine-pds/src/lib.rs b/adenosine-pds/src/lib.rs index 2b89eac..3664ce0 100644 --- a/adenosine-pds/src/lib.rs +++ b/adenosine-pds/src/lib.rs @@ -1,5 +1,5 @@ -use adenosine_cli::created_at_now; -use adenosine_cli::identifiers::{AtUri, Did, Nsid, Ticker, Tid}; +use adenosine::created_at_now; +use adenosine::identifiers::{AtUri, Did, Nsid, Ticker, Tid}; use anyhow::{anyhow, Result}; use askama::Template; use libipld::Cid; diff --git a/adenosine-pds/src/repo.rs b/adenosine-pds/src/repo.rs index 12cc493..f77b459 100644 --- a/adenosine-pds/src/repo.rs +++ b/adenosine-pds/src/repo.rs @@ -3,7 +3,7 @@ use crate::car::{ }; use crate::mst::{collect_mst_keys, generate_mst, CommitNode, MetadataNode, RootNode}; use crate::KeyPair; -use adenosine_cli::identifiers::{Did, Nsid, Tid}; +use adenosine::identifiers::{Did, Nsid, Tid}; use anyhow::{anyhow, ensure, Context, Result}; use ipfs_sqlite_block_store::BlockStore; use libipld::cbor::DagCborCodec; diff --git a/adenosine-pds/src/web.rs b/adenosine-pds/src/web.rs index 66ea4ce..fed9814 100644 --- a/adenosine-pds/src/web.rs +++ b/adenosine-pds/src/web.rs @@ -1,6 +1,6 @@ use crate::models::*; use crate::repo::RepoCommit; -use adenosine_cli::identifiers::{Did, Nsid, Tid}; +use adenosine::identifiers::{Did, Nsid, Tid}; use askama::Template; #[derive(Template)] -- cgit v1.2.3