Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(raiko): rename tasks manager #318

Merged
merged 3 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
!/provers/sgx/setup
!/kzg_settings_raw.bin
!/core
!/task_manager
!/tasks
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ members = [
"provers/sgx/setup",
"pipeline",
"core",
"task_manager",
"tasks",
]

# Always optimize; building and running the guest takes much longer without optimization.
Expand All @@ -36,7 +36,7 @@ opt-level = 3
# raiko
raiko-lib = { path = "./lib", features = ["std"] }
raiko-core = { path = "./core" }
raiko-task-manager = { path = "./task_manager" }
raiko-tasks = { path = "./tasks" }

# reth
reth-primitives = { git = "https://github.com/taikoxyz/taiko-reth.git", branch = "v1.0.0-rc.2-taiko", default-features = false, features = ["alloy-compat", "taiko"] }
Expand Down
2 changes: 1 addition & 1 deletion host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sgx-prover = { path = "../provers/sgx/prover", optional = true }
# raiko
raiko-lib = { workspace = true }
raiko-core = { workspace = true }
raiko-task-manager = { workspace = true }
raiko-tasks = { workspace = true }

# alloy
alloy-rlp = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion host/src/interfaces.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use axum::response::IntoResponse;
use raiko_core::interfaces::ProofType;
use raiko_lib::prover::ProverError;
use raiko_task_manager::{TaskManagerError, TaskStatus};
use raiko_tasks::{TaskManagerError, TaskStatus};
use tokio::sync::mpsc::error::TrySendError;
use utoipa::ToSchema;

Expand Down
2 changes: 1 addition & 1 deletion host/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use raiko_core::{
merge,
};
use raiko_lib::consts::SupportedChainSpecs;
use raiko_task_manager::TaskManagerOpts;
use raiko_tasks::TaskManagerOpts;
use serde::{Deserialize, Serialize};
use serde_json::Value;
use tokio::sync::mpsc;
Expand Down
2 changes: 1 addition & 1 deletion host/src/proof.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use raiko_core::{
Raiko,
};
use raiko_lib::{consts::SupportedChainSpecs, Measurement};
use raiko_task_manager::{get_task_manager, TaskManager, TaskStatus};
use raiko_tasks::{get_task_manager, TaskManager, TaskStatus};
use tokio::sync::{mpsc::Receiver, Semaphore};
use tracing::{error, info};

Expand Down
2 changes: 1 addition & 1 deletion host/src/server/api/v2/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use axum::{response::IntoResponse, Json, Router};
use raiko_task_manager::TaskStatus;
use raiko_tasks::TaskStatus;
use serde::{Serialize, Serializer};
use utoipa::{OpenApi, ToSchema};
use utoipa_scalar::{Scalar, Servable};
Expand Down
2 changes: 1 addition & 1 deletion host/src/server/api/v2/proof/cancel.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use axum::{debug_handler, extract::State, routing::post, Json, Router};
use raiko_core::{interfaces::ProofRequest, provider::get_task_data};
use raiko_task_manager::{get_task_manager, TaskManager, TaskStatus};
use raiko_tasks::{get_task_manager, TaskManager, TaskStatus};
use serde_json::Value;
use utoipa::OpenApi;

Expand Down
2 changes: 1 addition & 1 deletion host/src/server/api/v2/proof/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use axum::{debug_handler, extract::State, routing::post, Json, Router};
use raiko_core::{interfaces::ProofRequest, provider::get_task_data};
use raiko_task_manager::{
use raiko_tasks::{
get_task_manager, EnqueueTaskParams, TaskManager, TaskProvingStatus, TaskStatus,
};
use serde_json::Value;
Expand Down
2 changes: 1 addition & 1 deletion host/src/server/api/v2/proof/prune.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use axum::{debug_handler, extract::State, routing::post, Router};
use raiko_task_manager::{get_task_manager, TaskManager};
use raiko_tasks::{get_task_manager, TaskManager};
use utoipa::OpenApi;

use crate::{interfaces::HostResult, server::api::v2::PruneStatus, ProverState};
Expand Down
2 changes: 1 addition & 1 deletion host/src/server/api/v2/proof/report.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use axum::{debug_handler, extract::State, routing::post, Json, Router};
use raiko_task_manager::{get_task_manager, TaskManager};
use raiko_tasks::{get_task_manager, TaskManager};
use serde_json::Value;
use utoipa::OpenApi;

Expand Down
6 changes: 3 additions & 3 deletions task_manager/Cargo.toml → tasks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "raiko-task-manager"
name = "raiko-tasks"
version = "0.1.0"
authors = ["Mamy Ratsimbazafy <mamy $at$ taiko.xyz>"]
authors = ["Taiko Labs"]
edition = "2021" # { workspace = true }

[dependencies]
Expand Down Expand Up @@ -33,5 +33,5 @@ sqlite = []
in-memory = []

[[test]]
name = "task_manager_tests"
name = "tasks_tests"
path = "tests/main.rs"
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion task_manager/tests/main.rs → tasks/tests/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mod tests {
use rand_chacha::ChaCha8Rng;

use raiko_lib::{input::BlobProofType, primitives::B256};
use raiko_task_manager::{
use raiko_tasks::{
get_task_manager, EnqueueTaskParams, TaskManager, TaskManagerOpts, TaskStatus,
};

Expand Down
Loading