From 045a85eb39517464d4a300cc180ac8b834125dec Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Sun, 6 Nov 2022 20:55:28 -0800 Subject: pds: switch to adenosine-common for identifiers --- adenosine-pds/src/lib.rs | 6 +++--- adenosine-pds/src/repo.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'adenosine-pds/src') diff --git a/adenosine-pds/src/lib.rs b/adenosine-pds/src/lib.rs index a4b6114..5803782 100644 --- a/adenosine-pds/src/lib.rs +++ b/adenosine-pds/src/lib.rs @@ -1,4 +1,4 @@ -use adenosine_cli::{AtUri, Did, Nsid, Tid, TidLord}; +use adenosine_common::identifiers::{Did, Nsid, Tid, TidLord}; use anyhow::Context; use anyhow::{anyhow, Result}; use libipld::Cid; @@ -381,7 +381,7 @@ fn xrpc_post_handler( w.rkey .as_ref() .map(|t| Tid::from_str(&t).unwrap()) - .unwrap_or_else(|| srv.tid_gen.next()), + .unwrap_or_else(|| srv.tid_gen.next_tid()), json_value_into_ipld(w.value.clone()), ), "update" => Mutation::Update( @@ -419,7 +419,7 @@ fn xrpc_post_handler( let last_commit = srv.repo.get_commit(&commit_cid)?; let mutations: Vec = vec![Mutation::Create( collection, - srv.tid_gen.next(), + srv.tid_gen.next_tid(), json_value_into_ipld(record), )]; debug!("mutating tree"); diff --git a/adenosine-pds/src/repo.rs b/adenosine-pds/src/repo.rs index d8c4451..442f81b 100644 --- a/adenosine-pds/src/repo.rs +++ b/adenosine-pds/src/repo.rs @@ -1,6 +1,6 @@ use crate::load_car_to_blockstore; use crate::mst::{collect_mst_keys, generate_mst, CommitNode, MetadataNode, RootNode}; -use adenosine_cli::{Did, Nsid, Tid}; +use adenosine_common::identifiers::{Nsid, Tid}; use anyhow::{anyhow, ensure, Context, Result}; use ipfs_sqlite_block_store::BlockStore; use libipld::cbor::DagCborCodec; -- cgit v1.2.3