02e259f refactor: add ergo::Oid export — radicle-ci-broker

modified src/adapter.rs

@@ -496,13 +496,13 @@ mod test {

     use tempfile::{NamedTempFile, TempDir, tempdir};
     use radicle::git::Oid;
     use radicle::prelude::RepoId;
     use super::{Adapter, Db, Run};
     use crate::{
         adapter::AdapterError,
         cob::KnownJobCobs,
         ergo::Oid,
         msg::{MessageError, Response, RunId, RunResult},
         notif::NotificationChannel,
         run::{RunBuilder, Whence},

modified src/bin/cibtool.rs

@@ -18,13 +18,14 @@ use std::{

 use clap::Parser;
 use radicle::{git::Oid, prelude::NodeId};
 use radicle::prelude::NodeId;
 use radicle_ci_broker::{
     broker::BrokerError,
     ci_event::{CiEvent, CiEventError, CiEventV1},
     db::{Db, DbError, QueueId, QueuedCiEvent},
     ergo, logger,
     ergo::{self, Oid},
     logger,
     msg::{RunId, RunResult},
     notif::{NotificationChannel, NotificationError},
     pages::PageError,

modified src/bin/cibtoolcmd/cob.rs

@@ -2,9 +2,9 @@ use std::sync::{Arc, Mutex};

 use url::Url;
 use radicle::{git::Oid, identity::RepoId};
 use radicle::identity::RepoId;
 use radicle_ci_broker::cob::*;
 use radicle_ci_broker::{cob::*, ergo::Oid};
 use super::*;

modified src/cob.rs

@@ -15,7 +15,6 @@ use url::Url;

 use uuid::Uuid;
 use radicle::{
     git::Oid,
     node::{
         Handle, Node,
         sync::{Announcer, AnnouncerConfig, ReplicationFactor},

@@ -25,7 +24,7 @@ use radicle::{

 };
 use radicle_job::*;
 use crate::{logger, msg::RunId};
 use crate::{ergo::Oid, logger, msg::RunId};
 /// Lookup cache for job COBs.
 ///

modified src/ergo.rs

@@ -9,12 +9,13 @@ use std::str::FromStr;

 use radicle::{
     cob::patch::{Patch, PatchId, cache::Patches},
     git::Oid,
     identity::{Project, RepoId},
     profile::Profile,
     storage::{ReadStorage, RepositoryInfo, git::Repository},
 };
 pub use radicle::git::Oid;
 /// A Radicle node.
 ///
 /// This type represents a Radicle node, and exists to cache some

modified src/logger.rs

@@ -8,7 +8,7 @@ use tracing::{Level, debug, error, info, trace, warn};

 use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
 use uuid::Uuid;
 use radicle::{git::Oid, identity::RepoId, node::Event, patch::PatchId};
 use radicle::{identity::RepoId, node::Event, patch::PatchId};
 use radicle_job::{JobId, Reason};
 use crate::{

@@ -17,6 +17,7 @@ use crate::{

     ci_event_source::{CiEventSource, CiEventSourceError},
     config::Config,
     db::{QueueId, QueuedCiEvent},
     ergo::Oid,
     filter::{Decision, EventFilter},
     msg::{Request, RunId},
     node_event_source::NodeEventSource,

modified src/msg.rs

@@ -29,13 +29,13 @@ use radicle::{

 };
 pub use radicle::{
     cob::patch::PatchId,
     git::Oid,
     prelude::{NodeId, RepoId},
 };
 pub use radicle_surf::Commit;
 use crate::{
     ci_event::{CiEvent, CiEventV1},
     ergo::Oid,
     logger,
 };

modified src/pages.rs

@@ -20,7 +20,6 @@ use time::{OffsetDateTime, macros::format_description};

 use radicle::{
     Profile,
     git::Oid,
     prelude::RepoId,
     storage::{ReadRepository, ReadStorage},
 };

@@ -28,7 +27,8 @@ use radicle::{

 use crate::{
     ci_event::{CiEvent, CiEventV1},
     db::{Db, DbError, QueuedCiEvent},
     ergo, logger,
     ergo::{self, Oid},
     logger,
     msg::{RunId, RunResult},
     notif::NotificationReceiver,
     run::{Run, RunState, Whence},

modified src/run.rs

@@ -2,11 +2,13 @@ use std::fmt;

 use serde::{Deserialize, Serialize};
 use radicle::git::Oid;
 use radicle::prelude::RepoId;
 use radicle_job::JobId;
 use crate::msg::{Revision, RunId, RunResult};
 use crate::{
     ergo::Oid,
     msg::{Revision, RunId, RunResult},
 };
 #[derive(Debug, Default)]
 pub struct RunBuilder {

modified src/subplot.rs

@@ -10,7 +10,6 @@ use std::{

 };
 use radicle::{
     git::Oid,
     git::RefString,
     node::{Event, NodeId},
     prelude::RepoId,

@@ -20,6 +19,8 @@ use radicle::{

 use subplotlib::steplibrary::datadir::Datadir;
 use subplotlib::steplibrary::runcmd::Runcmd;
 use radicle_ci_broker::ergo::Oid;
 #[derive(Debug, Default)]
 struct SubplotContext {}

modified src/util.rs

@@ -17,11 +17,12 @@ use time::{

 use radicle::{
     Profile, Storage,
     cob::ObjectId,
     git::Oid,
     prelude::{NodeId, RepoId},
     storage::ReadStorage,
 };
 use crate::ergo::Oid;
 pub fn lookup_repo(profile: &Profile, wanted: &str) -> Result<(RepoId, String), UtilError> {
     let storage = Storage::open(profile.storage(), profile.info()).map_err(UtilError::storage)?;