Merge pull request #560 from AmbireTech/seeding-improvements

Seeding improvements

Author: simzzz

adapter/src/ethereum.rs

@@ -8,7 +8,7 @@ use web3::signing::keccak256;
 use crate::{Adapter, LockedState, UnlockedState};
 
 pub use {
-    client::{Ethereum, Options},
+    client::{ChainTransport, Ethereum, Options},
     error::Error,
 };
 

adapter/src/ethereum/client.rs

@@ -37,7 +37,7 @@ pub struct Ethereum<S = LockedWallet> {
     pub(crate) state: S,
 }
 
-pub(crate) trait ChainTransport {
+pub trait ChainTransport {
     fn init_web3(&self) -> web3::Result<Web3<Http>>;
 }
 

docs/config/ganache.toml

@@ -47,8 +47,6 @@ admins = [
     '0x80690751969B234697e9059e04ed72195c3507fa'
 ]
 
-seed_db = true
-
 [platform]
 # This should be changed for tests and use the wiremock url
 url = "https://platform.adex.network"

docs/config/prod.toml

@@ -28,8 +28,6 @@ validators_whitelist = []
 # Galya (for analytics)
 admins = ['0x5d6A3F1AD7b124ecDFDf4841D9bB246eD5fBF04c']
 
-seed_db = false
-
 [platform]
 # This should be changed for tests and use the wiremock url
 url = "https://platform.adex.network"

primitives/src/config.rs

@@ -182,7 +182,6 @@ pub struct Config {
     pub chains: HashMap<String, ChainInfo>,
     pub platform: PlatformConfig,
     pub limits: Limits,
-    pub seed_db: bool,
 }
 
 impl Config {

primitives/src/test_util.rs

@@ -300,7 +300,7 @@ pub static DUMMY_IPFS: Lazy<[IPFS; 5]> = Lazy::new(|| {
     ]
 });
 
-/// List of test campaigns with keys `Campaign {Chain id} #{Number campaign}`
+/// List of test campaigns
 pub static CAMPAIGNS: Lazy<[ChainOf<Campaign>; 3]> = Lazy::new(|| {
     let campaign_1337_1 = {
         let ganache_chain_info = GANACHE_CONFIG.chains["Ganache #1337"].clone();

sentry/Cargo.toml

@@ -25,7 +25,7 @@ futures = "0.3"
 async-trait = "0.1"
 # Primitives
 primitives = { version = "0.2", path = "../primitives", features = ["postgres"] }
-adapter = { version = "0.2", path = "../adapter" }
+adapter = { version = "0.2", path = "../adapter", features = ["test-util"] }
 chrono = { version = "0.4", features = ["serde"] }
 # used for redis test pool
 dashmap = { version = "5", optional = true }
@@ -72,7 +72,6 @@ reqwest = { version = "0.11", features = ["json", "cookies"] }
 
 [dev-dependencies]
 primitives = { version = "0.2", path = "../primitives", features = ["postgres", "test-util"] }
-adapter = { version = "0.2", path = "../adapter", features = ["test-util"] }
 pretty_assertions = "1"
 
 # we only require `hyper` for `hyper::body::to_bytes` function

sentry/src/application.rs

@@ -9,7 +9,7 @@ use axum::{
     http::{Method, StatusCode},
     middleware,
     routing::get,
-    Extension, Json, Router,
+    Extension, Router,
 };
 use axum_server::{tls_rustls::RustlsConfig, Handle};
 use once_cell::sync::Lazy;
@@ -19,23 +19,14 @@ use slog::{error, info, Logger};
 use tower::ServiceBuilder;
 use tower_http::cors::CorsLayer;
 
-use adapter::{client::Locked, Adapter, Dummy, Ethereum};
-use primitives::{
-    config::Environment, sentry::campaign_create::CreateCampaign, spender::Spendable,
-    test_util::CAMPAIGNS, unified_num::FromWhole, Campaign, ChainOf, Deposit, UnifiedNum,
-    ValidatorId,
-};
+use adapter::{client::Locked, Adapter};
+use primitives::{config::Environment, ValidatorId};
 
 use crate::{
-    db::{
-        campaign::insert_campaign, insert_channel, spendable::insert_spendable, CampaignRemaining,
-        DbPool,
-    },
+    db::{CampaignRemaining, DbPool},
     middleware::auth::authenticate,
     platform::PlatformApi,
     routes::{
-        campaign::create_campaign,
-        channel::{channel_dummy_deposit, ChannelDummyDeposit},
         get_cfg,
         routers::{analytics_router, campaigns_router, channels_router, units_for_slot_router},
     },
@@ -73,6 +64,9 @@ pub struct EnvConfig {
     /// Defaults to locally running Redis server: [`DEFAULT_REDIS_URL`]
     #[serde(deserialize_with = "redis_url", default = "default_redis_url")]
     pub redis_url: ConnectionInfo,
+    /// Whether or not to seed the database in [`Environment::Development`].
+    #[serde(default)]
+    pub seed_db: bool,
 }
 
 impl EnvConfig {
@@ -316,113 +310,152 @@ async fn shutdown_signal(logger: Logger, handle: Handle) {
     info!(&logger, "Received Ctrl+C signal. Shutting down..")
 }
 
-pub async fn seed_dummy(app: Application<Dummy>) -> Result<(), Box<dyn std::error::Error>> {
-    // create campaign
-    // Chain 1337
-    let campaign_1 = CAMPAIGNS[0].clone();
-    // Chain 1337
-    let campaign_2 = CAMPAIGNS[1].clone();
-    // Chain 1
-    let campaign_3 = CAMPAIGNS[2].clone();
-
-    async fn create_seed_campaign(
-        app: Application<Dummy>,
-        campaign: &ChainOf<Campaign>,
-    ) -> Result<(), Box<dyn std::error::Error>> {
-        let campaign_to_create = CreateCampaign::from_campaign(campaign.context.clone());
-        let auth = Auth {
-            era: 0,
-            uid: ValidatorId::from(campaign_to_create.creator),
-            chain: campaign.chain.clone(),
-        };
-        create_campaign(
-            Json(campaign_to_create),
-            Extension(auth),
-            Extension(Arc::new(app)),
-        )
-        .await
-        .expect("Should create seed campaigns");
-
-        Ok(())
-    }
-
-    async fn dummy_deposit(
-        app: Application<Dummy>,
-        campaign: &ChainOf<Campaign>,
-    ) -> Result<(), Box<dyn std::error::Error>> {
-        let channel = campaign.context.channel;
-        let auth = Auth {
-            era: 0,
-            uid: ValidatorId::from(campaign.context.creator),
-            chain: campaign.chain.clone(),
-        };
-
-        let request = ChannelDummyDeposit {
-            channel,
-            deposit: Deposit {
-                total: UnifiedNum::from_whole(1_000_000),
-            },
-        };
-
-        let result =
-            channel_dummy_deposit(Extension(Arc::new(app)), Extension(auth), Json(request)).await;
+pub mod seed {
+    use std::sync::Arc;
+
+    use axum::{Extension, Json};
+
+    use adapter::{
+        ethereum::{test_util::Erc20Token, ChainTransport},
+        Dummy, Ethereum,
+    };
+    use primitives::{
+        sentry::campaign_create::CreateCampaign, spender::Spendable, test_util::CAMPAIGNS,
+        unified_num::FromWhole, Campaign, ChainOf, Deposit, UnifiedNum, ValidatorId,
+    };
+
+    use crate::{
+        db::{campaign::insert_campaign, insert_channel, spendable::insert_spendable},
+        routes::{
+            campaign::create_campaign,
+            channel::{channel_dummy_deposit, ChannelDummyDeposit},
+        },
+        Application, Auth,
+    };
+
+    pub async fn seed_dummy(app: Application<Dummy>) -> Result<(), Box<dyn std::error::Error>> {
+        // create campaign
+        // Chain 1337
+        let campaign_1 = CAMPAIGNS[0].clone();
+        // Chain 1337
+        let campaign_2 = CAMPAIGNS[1].clone();
+        // Chain 1
+        let campaign_3 = CAMPAIGNS[2].clone();
+
+        async fn create_seed_campaign(
+            app: Application<Dummy>,
+            campaign: &ChainOf<Campaign>,
+        ) -> Result<(), Box<dyn std::error::Error>> {
+            let campaign_to_create = CreateCampaign::from_campaign(campaign.context.clone());
+            let auth = Auth {
+                era: 0,
+                uid: ValidatorId::from(campaign_to_create.creator),
+                chain: campaign.chain.clone(),
+            };
+            create_campaign(
+                Json(campaign_to_create),
+                Extension(auth),
+                Extension(Arc::new(app)),
+            )
+            .await
+            .expect("Should create seed campaigns");
 
-        assert!(result.is_ok());
+            Ok(())
+        }
 
+        async fn dummy_deposit(
+            app: Application<Dummy>,
+            campaign: &ChainOf<Campaign>,
+        ) -> Result<(), Box<dyn std::error::Error>> {
+            let channel = campaign.context.channel;
+            let auth = Auth {
+                era: 0,
+                uid: ValidatorId::from(campaign.context.creator),
+                chain: campaign.chain.clone(),
+            };
+
+            let request = ChannelDummyDeposit {
+                channel,
+                deposit: Deposit {
+                    total: UnifiedNum::from_whole(1_000_000),
+                },
+            };
+
+            let result =
+                channel_dummy_deposit(Extension(Arc::new(app)), Extension(auth), Json(request))
+                    .await;
+
+            assert!(result.is_ok());
+
+            Ok(())
+        }
+        // chain 1337
+        dummy_deposit(app.clone(), &campaign_1).await?;
+        // chain 1337
+        dummy_deposit(app.clone(), &campaign_2).await?;
+        // chain 1
+        dummy_deposit(app.clone(), &campaign_3).await?;
+
+        create_seed_campaign(app.clone(), &campaign_1).await?;
+        create_seed_campaign(app.clone(), &campaign_2).await?;
+        create_seed_campaign(app.clone(), &campaign_3).await?;
         Ok(())
     }
-    // chain 1337
-    dummy_deposit(app.clone(), &campaign_1).await?;
-    // chain 1337
-    dummy_deposit(app.clone(), &campaign_2).await?;
-    // chain 1
-    dummy_deposit(app.clone(), &campaign_3).await?;
-
-    create_seed_campaign(app.clone(), &campaign_1).await?;
-    create_seed_campaign(app.clone(), &campaign_2).await?;
-    create_seed_campaign(app.clone(), &campaign_3).await?;
-    Ok(())
-}
-
-pub async fn seed_ethereum(app: Application<Ethereum>) -> Result<(), Box<dyn std::error::Error>> {
-    // create campaign
-    // Chain 1337
-    let campaign_1 = CAMPAIGNS[0].clone();
-    // Chain 1337
-    let campaign_2 = CAMPAIGNS[1].clone();
-    // Chain 1
-    let campaign_3 = CAMPAIGNS[2].clone();
 
-    async fn create_seed_campaign(
+    pub async fn seed_ethereum(
         app: Application<Ethereum>,
-        campaign: &ChainOf<Campaign>,
     ) -> Result<(), Box<dyn std::error::Error>> {
-        let channel_context = ChainOf::of_channel(campaign);
-
-        let spendable = Spendable {
-            spender: campaign.context.creator,
-            channel: campaign.context.channel,
-            deposit: Deposit {
-                total: UnifiedNum::from_u64(10_000_000),
-            },
-        };
-        insert_channel(&app.pool, &channel_context)
-            .await
-            .expect("Should insert channel of seed campaign");
-        insert_campaign(&app.pool, &campaign.context)
-            .await
-            .expect("Should insert seed campaign");
-        insert_spendable(app.pool.clone(), &spendable)
-            .await
-            .expect("Should insert spendable for campaign creator");
+        // Chain 1337
+        let campaign_1 = CAMPAIGNS[0].clone();
+        // Chain 1337
+        let campaign_2 = CAMPAIGNS[1].clone();
+        // Chain 1
+        let campaign_3 = CAMPAIGNS[2].clone();
+
+        let web3_chain_1337 = campaign_1.chain.init_web3()?;
+        let token_1337 = Erc20Token::new(&web3_chain_1337, campaign_1.token.clone());
+        let web3_chain_1 = campaign_3.chain.init_web3()?;
+        let token_1 = Erc20Token::new(&web3_chain_1, campaign_3.token.clone());
+
+        // TODO: Call set_balance() and set balance for ADVERTISER & ADVERTISER_2
+        // large enough for the campaigns + extra on top
+
+        // token_1337.set_balance(from, address, amount)
+        // token_1.set_balance(from, address, amount)
+
+        async fn create_seed_campaign(
+            app: Application<Ethereum>,
+            campaign: &ChainOf<Campaign>,
+        ) -> Result<(), Box<dyn std::error::Error>> {
+            let channel_context = ChainOf::of_channel(campaign);
+
+            // TODO: call create_campaign()
+
+            let spendable = Spendable {
+                spender: campaign.context.creator,
+                channel: campaign.context.channel,
+                deposit: Deposit {
+                    total: UnifiedNum::from_u64(10_000_000),
+                },
+            };
+            insert_channel(&app.pool, &channel_context)
+                .await
+                .expect("Should insert channel of seed campaign");
+            insert_campaign(&app.pool, &campaign.context)
+                .await
+                .expect("Should insert seed campaign");
+            insert_spendable(app.pool.clone(), &spendable)
+                .await
+                .expect("Should insert spendable for campaign creator");
+
+            Ok(())
+        }
 
+        create_seed_campaign(app.clone(), &campaign_1).await?;
+        create_seed_campaign(app.clone(), &campaign_2).await?;
+        create_seed_campaign(app.clone(), &campaign_3).await?;
         Ok(())
     }
-
-    create_seed_campaign(app.clone(), &campaign_1).await?;
-    create_seed_campaign(app.clone(), &campaign_2).await?;
-    create_seed_campaign(app.clone(), &campaign_3).await?;
-    Ok(())
 }
 
 #[cfg(test)]