eth-bytecode-db: bump sea-orm to v0.12.2; bump blockscout-service-lau…

…ncher to v0.8.0 (#604) * Bump sea-orm to v0.12.2; bump blockscout-service-launcher to v0.8.0
blockscout · Sep 4, 2023 · edb289a · edb289a
1 parent 01400a4
commit edb289a
Show file tree

Hide file tree

Showing 18 changed files with 512 additions and 233 deletions.
diff --git a/eth-bytecode-db/Cargo.lock b/eth-bytecode-db/Cargo.lock
diff --git a/eth-bytecode-db/eth-bytecode-db-server/Cargo.toml b/eth-bytecode-db/eth-bytecode-db-server/Cargo.toml
@@ -15,10 +15,10 @@ amplify = { version = "3.13.0", features = ["derive"] }
 anyhow = "1.0"
 async-trait = "0.1"
 blockscout-display-bytes = "1.0"
-blockscout-service-launcher = { version = "0.7.1", features = [ "database-0_11" ] }
+blockscout-service-launcher = { version = "0.8.0", features = [ "database-0_12" ] }
 config = "0.13"
 ethers = "2.0.0"
-sea-orm = "0.11"
+sea-orm = "0.12.2"
 serde = "1.0"
 serde_json = "1.0.96"
 serde_with = "2.1"

diff --git a/eth-bytecode-db/eth-bytecode-db-server/src/server.rs b/eth-bytecode-db/eth-bytecode-db-server/src/server.rs
@@ -13,7 +13,7 @@ use crate::{
     },
     settings::Settings,
 };
-use blockscout_service_launcher::LaunchSettings;
+use blockscout_service_launcher::{database, launcher, launcher::LaunchSettings, tracing};
 use eth_bytecode_db::verification::Client;
 use migration::Migrator;
 use std::sync::Arc;
@@ -52,7 +52,7 @@ impl Router {
     }
 }
 
-impl blockscout_service_launcher::HttpRouter for Router {
+impl launcher::HttpRouter for Router {
     fn register_routes(&self, service_config: &mut actix_web::web::ServiceConfig) {
         service_config.configure(|config| route_health(config, self.health.clone()));
 
@@ -72,11 +72,11 @@ impl blockscout_service_launcher::HttpRouter for Router {
 }
 
 pub async fn run(settings: Settings) -> Result<(), anyhow::Error> {
-    blockscout_service_launcher::init_logs(SERVICE_NAME, &settings.tracing, &settings.jaeger)?;
+    tracing::init_logs(SERVICE_NAME, &settings.tracing, &settings.jaeger)?;
 
     let health = Arc::new(HealthService::default());
 
-    blockscout_service_launcher::database::initialize_postgres::<Migrator>(
+    database::initialize_postgres::<Migrator>(
         &settings.database.url,
         settings.database.create_database,
         settings.database.run_migrations,
@@ -114,5 +114,5 @@ pub async fn run(settings: Settings) -> Result<(), anyhow::Error> {
         metrics: settings.metrics,
     };
 
-    blockscout_service_launcher::launch(&launch_settings, http_router, grpc_router).await
+    launcher::launch(&launch_settings, http_router, grpc_router).await
 }
diff --git a/eth-bytecode-db/eth-bytecode-db-server/src/settings.rs b/eth-bytecode-db/eth-bytecode-db-server/src/settings.rs
@@ -1,5 +1,6 @@
 use blockscout_service_launcher::{
-    JaegerSettings, MetricsSettings, ServerSettings, TracingSettings,
+    launcher::{MetricsSettings, ServerSettings},
+    tracing::{JaegerSettings, TracingSettings},
 };
 use config::{Config, File};
 use serde::{de, Deserialize};

diff --git a/eth-bytecode-db/eth-bytecode-db/Cargo.toml b/eth-bytecode-db/eth-bytecode-db/Cargo.toml
@@ -15,7 +15,7 @@ ethabi = "18.0"
 ethers-core = "2.0.0"
 hex = "0.4"
 mismatch = "1.0"
-sea-orm = { version = "0.11", features = [
+sea-orm = { version = "0.12.2", features = [
     "sqlx-postgres",
     "runtime-tokio-rustls",
     "macros",

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/Cargo.toml b/eth-bytecode-db/eth-bytecode-db/entity/Cargo.toml
@@ -9,5 +9,5 @@ name = "entity"
 path = "src/lib.rs"
 
 [dependencies]
-sea-orm = { version = "0.11", features = [ "sqlx-postgres", "runtime-tokio-rustls", "macros" ] }
+sea-orm = { version = "0.12.2", features = [ "sqlx-postgres", "runtime-tokio-rustls", "macros" ] }
 
diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/bytecode_parts.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/bytecode_parts.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/bytecodes.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/bytecodes.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use super::sea_orm_active_enums::BytecodeType;
 use sea_orm::entity::prelude::*;
@@ -16,6 +16,8 @@ pub struct Model {
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
+    #[sea_orm(has_many = "super::bytecode_parts::Entity")]
+    BytecodeParts,
     #[sea_orm(
         belongs_to = "super::sources::Entity",
         from = "Column::SourceId",
@@ -24,19 +26,17 @@ pub enum Relation {
         on_delete = "NoAction"
     )]
     Sources,
-    #[sea_orm(has_many = "super::bytecode_parts::Entity")]
-    BytecodeParts,
 }
 
-impl Related<super::sources::Entity> for Entity {
+impl Related<super::bytecode_parts::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Sources.def()
+        Relation::BytecodeParts.def()
     }
 }
 
-impl Related<super::bytecode_parts::Entity> for Entity {
+impl Related<super::sources::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::BytecodeParts.def()
+        Relation::Sources.def()
     }
 }
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/files.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/files.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/lib.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/lib.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 pub mod prelude;
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/parts.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/parts.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use super::sea_orm_active_enums::PartType;
 use sea_orm::entity::prelude::*;

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/prelude.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/prelude.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 pub use super::{
     bytecode_parts::Entity as BytecodeParts, bytecodes::Entity as Bytecodes,

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/sea_orm_active_enums.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/sea_orm_active_enums.rs
@@ -1,24 +1,24 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, DeriveDisplay)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "bytecode_type")]
 pub enum BytecodeType {
     #[sea_orm(string_value = "creation_input")]
     CreationInput,
     #[sea_orm(string_value = "deployed_bytecode")]
     DeployedBytecode,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, DeriveDisplay)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "part_type")]
 pub enum PartType {
     #[sea_orm(string_value = "main")]
     Main,
     #[sea_orm(string_value = "metadata")]
     Metadata,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, DeriveDisplay)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "source_type")]
 pub enum SourceType {
     #[sea_orm(string_value = "solidity")]
@@ -28,7 +28,7 @@ pub enum SourceType {
     #[sea_orm(string_value = "yul")]
     Yul,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, DeriveDisplay)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "verification_type")]
 pub enum VerificationType {
     #[sea_orm(string_value = "flattened_contract")]

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/source_files.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/source_files.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use sea_orm::entity::prelude::*;
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/sources.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/sources.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use super::sea_orm_active_enums::SourceType;
 use sea_orm::entity::prelude::*;
@@ -27,23 +27,23 @@ pub struct Model {
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
-    #[sea_orm(has_many = "super::source_files::Entity")]
-    SourceFiles,
     #[sea_orm(has_many = "super::bytecodes::Entity")]
     Bytecodes,
+    #[sea_orm(has_many = "super::source_files::Entity")]
+    SourceFiles,
     #[sea_orm(has_many = "super::verified_contracts::Entity")]
     VerifiedContracts,
 }
 
-impl Related<super::source_files::Entity> for Entity {
+impl Related<super::bytecodes::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::SourceFiles.def()
+        Relation::Bytecodes.def()
     }
 }
 
-impl Related<super::bytecodes::Entity> for Entity {
+impl Related<super::source_files::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Bytecodes.def()
+        Relation::SourceFiles.def()
     }
 }
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/verified_contracts.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/verified_contracts.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.2
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
 
 use super::sea_orm_active_enums::{BytecodeType, VerificationType};
 use sea_orm::entity::prelude::*;

diff --git a/eth-bytecode-db/eth-bytecode-db/migration/Cargo.toml b/eth-bytecode-db/eth-bytecode-db/migration/Cargo.toml
@@ -12,7 +12,7 @@ path = "src/lib.rs"
 async-std = { version = "^1", features = ["attributes", "tokio1"] }
 
 [dependencies.sea-orm-migration]
-version = "0.11"
+version = "0.12.2"
 features = [
   # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
   # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.

diff --git a/eth-bytecode-db/eth-bytecode-db/migration/src/lib.rs b/eth-bytecode-db/eth-bytecode-db/migration/src/lib.rs
@@ -1,5 +1,5 @@
 pub use sea_orm_migration::prelude::*;
-use sea_orm_migration::sea_orm::{ConnectionTrait, Statement, TransactionTrait};
+use sea_orm_migration::sea_orm::{Statement, TransactionTrait};
 
 mod m20220101_000001_initial_tables;
 mod m20221122_222955_add_indexes;