From 5ebf6caec6a022a66684cab517309fc410534513 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Thu, 4 Jul 2024 11:49:29 +0200 Subject: [PATCH 1/5] run migrations --- chain/src/main.rs | 4 ++++ docker-compose.yml | 16 ++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/chain/src/main.rs b/chain/src/main.rs index d616d5f..dcae244 100644 --- a/chain/src/main.rs +++ b/chain/src/main.rs @@ -46,6 +46,10 @@ async fn main() -> Result<(), MainError> { let app_state = AppState::new(database_url).into_db_error()?; + db_service::run_migrations( + app_state.get_db_connection().await.into_db_error()?, + ).await.into_db_error()?; + let (last_block_height, commitment_tree, witness_map) = load_committed_state(&app_state).await?; diff --git a/docker-compose.yml b/docker-compose.yml index 35fcad3..64d3885 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,9 +8,9 @@ services: POSTGRES_PASSWORD: password POSTGRES_USER: postgres PGUSER: postgres - POSTGRES_DB: indexer_local + POSTGRES_DB: masp_indexer_local healthcheck: - test: ["CMD-SHELL", "pg_isready", "-d", "indexer_local"] + test: ["CMD-SHELL", "pg_isready", "-d", "masp_indexer_local"] interval: 5s timeout: 10s retries: 5 @@ -24,23 +24,19 @@ services: ports: - 5000:5000 environment: - CARGO_ENV: development PORT: 5000 - DATABASE_URL: postgres://postgres:password@postgres:5432/indexer_local + DATABASE_URL: postgres://postgres:password@postgres:5432/masp_indexer_local depends_on: - crawler crawler: - image: namada-masp-crawler build: context: . dockerfile: chain/Dockerfile environment: - CARGO_ENV: development - TENDERMINT_URL: <> - CHECKSUMS_FILEPATH: <> - CHAIN_ID: <> - DATABASE_URL: postgres://postgres:password@postgres:5432/indexer_local + COMETBFT_URL: https://rpc.luminara.icu + CHAIN_ID: luminara-position.5eef10f5ab83 + DATABASE_URL: postgres://postgres:password@postgres:5432/masp_indexer_local depends_on: postgres: condition: service_healthy From 800dccacceaefb709989ce7c144410d8e49ba82f Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Thu, 4 Jul 2024 11:50:12 +0200 Subject: [PATCH 2/5] run migrations --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 64d3885..33a580a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,8 +34,8 @@ services: context: . dockerfile: chain/Dockerfile environment: - COMETBFT_URL: https://rpc.luminara.icu - CHAIN_ID: luminara-position.5eef10f5ab83 + COMETBFT_URL: <> + CHAIN_ID: <> DATABASE_URL: postgres://postgres:password@postgres:5432/masp_indexer_local depends_on: postgres: From 5f4e61c0792c0842e423a3dce75b241762c5d8f8 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Thu, 4 Jul 2024 13:30:37 +0200 Subject: [PATCH 3/5] minors --- webserver/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/webserver/Cargo.toml b/webserver/Cargo.toml index 5b5c7b9..fc75606 100644 --- a/webserver/Cargo.toml +++ b/webserver/Cargo.toml @@ -7,6 +7,7 @@ edition.workspace = true license.workspace = true readme.workspace = true version.workspace = true +build = "build.rs" [[bin]] name = "webserver" From 674740f75fa13eaf6d2e648cf0a7333d56bbb6ab Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Fri, 5 Jul 2024 19:16:07 +0100 Subject: [PATCH 4/5] fmt --- chain/src/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chain/src/main.rs b/chain/src/main.rs index dcae244..f00fce3 100644 --- a/chain/src/main.rs +++ b/chain/src/main.rs @@ -48,7 +48,9 @@ async fn main() -> Result<(), MainError> { db_service::run_migrations( app_state.get_db_connection().await.into_db_error()?, - ).await.into_db_error()?; + ) + .await + .into_db_error()?; let (last_block_height, commitment_tree, witness_map) = load_committed_state(&app_state).await?; From 8c8d2efb24b755ee28e3f546df31e6ea85b45963 Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Fri, 5 Jul 2024 19:20:53 +0100 Subject: [PATCH 5/5] move migrations code to a new fn --- chain/src/main.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/chain/src/main.rs b/chain/src/main.rs index f00fce3..c417f85 100644 --- a/chain/src/main.rs +++ b/chain/src/main.rs @@ -7,6 +7,7 @@ use std::collections::BTreeMap; use std::sync::atomic::{self, AtomicBool}; use std::sync::Arc; +use anyhow::Context; use clap::Parser; use shared::error::{IntoMainError, MainError}; use shared::height::{BlockHeight, FollowingHeights}; @@ -46,11 +47,7 @@ async fn main() -> Result<(), MainError> { let app_state = AppState::new(database_url).into_db_error()?; - db_service::run_migrations( - app_state.get_db_connection().await.into_db_error()?, - ) - .await - .into_db_error()?; + run_migrations(&app_state).await?; let (last_block_height, commitment_tree, witness_map) = load_committed_state(&app_state).await?; @@ -108,6 +105,15 @@ fn must_exit_handle() -> Arc { handle } +async fn run_migrations(app_state: &AppState) -> Result<(), MainError> { + db_service::run_migrations( + app_state.get_db_connection().await.into_db_error()?, + ) + .await + .context("Failed to run db migrations") + .into_db_error() +} + async fn load_committed_state( app_state: &AppState, ) -> Result<(Option, CommitmentTree, WitnessMap), MainError> {