wip

anoma · Dec 1, 2024 · 78f2e24 · 78f2e24
1 parent 374f48c
commit 78f2e24
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 19 deletions.
diff --git a/governance/src/main.rs b/governance/src/main.rs
@@ -246,7 +246,11 @@ async fn crawling_fn(
                     )?;
                 }
 
-                repository::pgf::update_pgf(transaction_conn, pgf_payments, native_token)?;
+                repository::pgf::update_pgf(
+                    transaction_conn,
+                    pgf_payments,
+                    native_token,
+                )?;
 
                 repository::crawler_state::upsert_crawler_state(
                     transaction_conn,

diff --git a/governance/src/repository/pgf.rs b/governance/src/repository/pgf.rs
@@ -1,15 +1,15 @@
 use anyhow::Context;
 use diesel::query_dsl::methods::FilterDsl;
-use diesel::BoolExpressionMethods;
-use diesel::{upsert::excluded, ExpressionMethods, PgConnection, RunQueryDsl};
+use diesel::upsert::excluded;
+use diesel::{
+    BoolExpressionMethods, ExpressionMethods, PgConnection, RunQueryDsl,
+};
 use namada_governance::cli::onchain::PgfAction;
 use orm::balances::BalancesInsertDb;
 use orm::pgf::PublicGoodFundingPaymentInsertDb;
 use orm::schema::{balances, public_good_funding};
-use shared::{
-    id::Id,
-    pgf::{PaymentRecurrence, PgfPayment},
-};
+use shared::id::Id;
+use shared::pgf::{PaymentRecurrence, PgfPayment};
 
 pub fn update_pgf(
     transaction_conn: &mut PgConnection,

diff --git a/orm/src/schema.rs b/orm/src/schema.rs
@@ -1,47 +1,91 @@
 // @generated automatically by Diesel CLI.
 
 pub mod sql_types {
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "crawler_name"))]
     pub struct CrawlerName;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "governance_kind"))]
     pub struct GovernanceKind;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "governance_result"))]
     pub struct GovernanceResult;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "governance_tally_type"))]
     pub struct GovernanceTallyType;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "payment_kind"))]
     pub struct PaymentKind;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "payment_recurrence"))]
     pub struct PaymentRecurrence;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "token_type"))]
     pub struct TokenType;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "transaction_kind"))]
     pub struct TransactionKind;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "transaction_result"))]
     pub struct TransactionResult;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "validator_state"))]
     pub struct ValidatorState;
 
-    #[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
+    #[derive(
+        diesel::query_builder::QueryId,
+        std::fmt::Debug,
+        diesel::sql_types::SqlType,
+    )]
     #[diesel(postgres_type(name = "vote_kind"))]
     pub struct VoteKind;
 }

diff --git a/shared/src/pgf.rs b/shared/src/pgf.rs
@@ -31,5 +31,5 @@ pub struct PgfPayment {
     pub kind: PaymentKind,
     pub receipient: Id,
     pub amount: Amount,
-    pub action: Option<PgfAction>
+    pub action: Option<PgfAction>,
 }