works

Lightprotocol · Jul 28, 2024 · f67801d · f67801d
1 parent b244f62
commit f67801d
Show file tree

Hide file tree

Showing 6 changed files with 482 additions and 302 deletions.
diff --git a/programs/registry/src/protocol_config/state.rs b/programs/registry/src/protocol_config/state.rs
@@ -1,4 +1,4 @@
-use crate::errors::RegistryError;
+use crate::{errors::RegistryError, MINT};
 use aligned_sized::aligned_sized;
 use anchor_lang::prelude::*;
 
@@ -50,14 +50,14 @@ impl Default for ProtocolConfig {
     fn default() -> Self {
         Self {
             genesis_slot: 0,
-            epoch_reward: 0,
-            base_reward: 0,
+            epoch_reward: 1_000_000,
+            base_reward: 500_000,
             min_stake: 0,
             slot_length: 10,
             registration_phase_length: 100,
             active_phase_length: 1000,
             report_work_phase_length: 100,
-            mint: Pubkey::default(),
+            mint: MINT,
             forester_registration_guarded: true,
         }
     }

diff --git a/test-programs/e2e-test/tests/test.rs b/test-programs/e2e-test/tests/test.rs
@@ -4,7 +4,9 @@ use light_registry::protocol_config::state::ProtocolConfig;
 use light_test_utils::e2e_test_env::{E2ETestEnv, GeneralActionConfig, KeypairActionConfig};
 use light_test_utils::indexer::TestIndexer;
 use light_test_utils::rpc::ProgramTestRpcConnection;
-use light_test_utils::test_env::setup_test_programs_with_accounts_with_protocol_config;
+use light_test_utils::test_env::{
+    set_env_with_delegate_and_forester, setup_test_programs_with_accounts_with_protocol_config,
+};
 
 #[tokio::test]
 async fn test_10_all() {
@@ -16,30 +18,39 @@ async fn test_10_all() {
         report_work_phase_length: 100,
         ..ProtocolConfig::default()
     };
-    let (rpc, env_accounts) =
-        setup_test_programs_with_accounts_with_protocol_config(None, protocol_config, true).await;
-
-    let indexer: TestIndexer<ProgramTestRpcConnection> = TestIndexer::init_from_env(
-        &env_accounts.forester.insecure_clone(),
-        &env_accounts,
-        KeypairActionConfig::all_default().inclusion(),
-        KeypairActionConfig::all_default().non_inclusion(),
-    )
-    .await;
+    // let (rpc, env_accounts) =
+    //     setup_test_programs_with_accounts_with_protocol_config(None, protocol_config, true).await;
 
-    let mut env =
-        E2ETestEnv::<ProgramTestRpcConnection, TestIndexer<ProgramTestRpcConnection>>::new(
-            rpc,
-            indexer,
-            &env_accounts,
-            KeypairActionConfig::all_default(),
-            GeneralActionConfig::default(),
+    // let indexer: TestIndexer<ProgramTestRpcConnection> = TestIndexer::init_from_env(
+    //     &env_accounts.forester.insecure_clone(),
+    //     &env_accounts,
+    //     KeypairActionConfig::all_default().inclusion(),
+    //     KeypairActionConfig::all_default().non_inclusion(),
+    // )
+    // .await;
+    let (mut e2e_env, _delegate_keypair, _env, _tree_accounts, _registered_epoch) =
+        set_env_with_delegate_and_forester(
+            None,
+            Some(KeypairActionConfig::all_default()),
+            Some(GeneralActionConfig::default()),
             10,
             None,
         )
         .await;
-    env.execute_rounds().await;
-    println!("stats {:?}", env.stats);
+
+    // let mut env =
+    //     E2ETestEnv::<ProgramTestRpcConnection, TestIndexer<ProgramTestRpcConnection>>::new(
+    //         rpc,
+    //         indexer,
+    //         &env_accounts,
+    //         KeypairActionConfig::all_default(),
+    //         GeneralActionConfig::default(),
+    //         10,
+    //         None,
+    //     )
+    //     .await;
+    e2e_env.execute_rounds().await;
+    println!("stats {:?}", e2e_env.stats);
 }
 
 //  cargo test-sbf -p e2e-test -- --nocapture --ignored --test test_10000_all > output.txt 2>&1