change mind again and put common back in cli crate (want fewer crates)

10 files changed, 6 insertions, 33 deletions

diff --git a/adenosine-cli/Cargo.toml b/adenosine-cli/Cargo.toml
index 7b2902a..24207fd 100644
--- a/adenosine-cli/Cargo.toml
+++ b/adenosine-cli/Cargo.toml
@@ -15,7 +15,6 @@ readme = "../README.md"
 repository = "https://gitlab.com/bnewbold/adenosine"
 
 [dependencies]
-adenosine-common = { version = "0.1.0-dev.0", path = "../adenosine-common" }
 structopt = "*"
 # NOTE: could try 'rustls-tls' feature instead of default native TLS?
 reqwest = { version = "0.11", features = ["blocking", "json"] }
diff --git a/adenosine-cli/src/bin/adenosine.rs b/adenosine-cli/src/bin/adenosine.rs
index 8b937bc..1172382 100644
--- a/adenosine-cli/src/bin/adenosine.rs
+++ b/adenosine-cli/src/bin/adenosine.rs
@@ -1,5 +1,5 @@
+use adenosine_cli::identifiers::*;
 use adenosine_cli::*;
-use adenosine_common::identifiers::*;
 use anyhow::anyhow;
 use serde_json::{json, Value};
 use std::collections::HashMap;
diff --git a/adenosine-common/src/identifiers.rs b/adenosine-cli/src/identifiers.rs
index 8a08ef3..8a08ef3 100644
--- a/adenosine-common/src/identifiers.rs
+++ b/adenosine-cli/src/identifiers.rs
diff --git a/adenosine-cli/src/lib.rs b/adenosine-cli/src/lib.rs
index f05a865..5d08286 100644
--- a/adenosine-cli/src/lib.rs
+++ b/adenosine-cli/src/lib.rs
@@ -8,6 +8,8 @@ use std::collections::HashMap;
 use std::str::FromStr;
 use std::time::Duration;
 
+pub mod identifiers;
+
 static APP_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),);
 
 #[derive(Debug, PartialEq, Eq, Clone)]
diff --git a/adenosine-common/Cargo.toml b/adenosine-common/Cargo.toml
deleted file mode 100644
index f6f1ad2..0000000
--- a/adenosine-common/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "adenosine-common"
-description = "Shared things (eg, types) for adenosine codebase"
-keywords = ["atproto"]
-categories = []
-
-# common across workspace
-version = "0.1.0-dev.0"
-edition = "2021"
-rust-version = "1.61"
-authors = ["Bryan Newbold <bnewbold@robocracy.org>"]
-license = "AGPLv3"
-readme = "../README.md"
-repository = "https://gitlab.com/bnewbold/adenosine"
-
-[dependencies]
-structopt = "*"
-regex = "*"
-lazy_static = "*"
-data-encoding = "*"
-rand = "*"
-anyhow = "1.0"
-
diff --git a/adenosine-common/README.md b/adenosine-common/README.md
deleted file mode 100644
index a386f63..0000000
--- a/adenosine-common/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Some shared types and utilities used across multiple adenosine crates.
diff --git a/adenosine-common/src/lib.rs b/adenosine-common/src/lib.rs
deleted file mode 100644
index 8475c16..0000000
--- a/adenosine-common/src/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-/// Some shared types and utilities used across multiple adenosine crates.
-
-pub mod identifiers;
diff --git a/adenosine-pds/Cargo.toml b/adenosine-pds/Cargo.toml
index 5bc134e..eb35f2e 100644
--- a/adenosine-pds/Cargo.toml
+++ b/adenosine-pds/Cargo.toml
@@ -27,7 +27,7 @@ jsonschema = "*"
 schemafy = "*"
 rouille = "*"
 iroh-car = { version = "0.1.0-vendored.0", path = "../iroh-car" }
-adenosine-common = { version = "0.1.0-dev.0", path = "../adenosine-common" }
+adenosine-cli = { version = "0.1.0-dev.0", path = "../adenosine-cli" }
 tokio = { version = "1", features = ["full"] }
 futures = "0.3"
 sha256 = "*"
diff --git a/adenosine-pds/src/lib.rs b/adenosine-pds/src/lib.rs
index 917aa7e..4071570 100644
--- a/adenosine-pds/src/lib.rs
+++ b/adenosine-pds/src/lib.rs
@@ -1,4 +1,4 @@
-use adenosine_common::identifiers::{Did, Nsid, Tid, TidLord};
+use adenosine_cli::identifiers::{Did, Nsid, Tid, TidLord};
 use anyhow::Context;
 use anyhow::{anyhow, Result};
 use libipld::Cid;
diff --git a/adenosine-pds/src/repo.rs b/adenosine-pds/src/repo.rs
index c75ba15..289125c 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_common::identifiers::{Nsid, Tid};
+use adenosine_cli::identifiers::{Nsid, Tid};
 use anyhow::{anyhow, ensure, Context, Result};
 use ipfs_sqlite_block_store::BlockStore;
 use libipld::cbor::DagCborCodec;