Skip to content

feat: support multi circuits - update column circuit of table task to type string #239

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 16, 2021
Merged

feat: support multi circuits - update column circuit of table task to type string #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
feb529d
Update `fluidex-common` for removing `CircuitType`.
silathdiir Nov 15, 2021
c171cb1
Update `fluidex-common`.
silathdiir Nov 16, 2021
f2d45f7
cargo fmt
0xmountaintop Nov 16, 2021
9226511
Merge branch 'master' into feat-support-multi-circuits
0xmountaintop Nov 16, 2021
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
31 changes: 19 additions & 12 deletions Cargo.lock
View file
Open in desktop

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

17 changes: 6 additions & 11 deletions src/bin/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,11 @@
#![allow(dead_code)]

use crossbeam_channel::RecvTimeoutError;
use fluidex_common::db::models::tablenames;
use fluidex_common::db::models::task::TaskStatus;
use fluidex_common::db::MIGRATOR;
use fluidex_common::non_blocking_tracing;
use fluidex_common::{
db::{
models::{
tablenames,
task::{CircuitType, TaskStatus},
},
MIGRATOR,
},
types::FrExt,
};
use fluidex_common::types::FrExt;
use rollup_state_manager::config::Settings;
use rollup_state_manager::grpc::run_grpc_server;
use rollup_state_manager::msg::{msg_loader, msg_processor};
Expand Down Expand Up @@ -240,6 +234,7 @@ async fn save_block_to_db(pool: &PgPool, block: &L2Block) -> anyhow::Result<()>
}

async fn save_task_to_db(pool: &PgPool, block: L2Block) -> anyhow::Result<()> {
let tx_num = block.detail.encoded_txs.len();
let input = L2BlockSerde::from(block.detail);
let task_id = unique_task_id();

Expand All @@ -248,7 +243,7 @@ async fn save_task_to_db(pool: &PgPool, block: L2Block) -> anyhow::Result<()> {
tablenames::TASK
))
.bind(task_id)
.bind(CircuitType::BLOCK)
.bind(format!("block_{}", tx_num))
.bind(block.block_id as i64) // TODO: will it overflow?
.bind(sqlx::types::Json(input))
.bind(TaskStatus::Inited)
Expand Down