Merge pull request #98 from Ackee-Blockchain/feat/dyn-templates

✨ Support for dynamic templates.

crates/client/src/templates/trdelnik-tests/fuzz_target.rs

@@ -1,6 +1,8 @@
 use assert_matches::*;
 use trdelnik_client::fuzzing::*;
 
+const PROGRAM_NAME: &str = "###PROGRAM_NAME###";
+
 #[derive(Arbitrary)]
 pub struct FuzzData {
     param1: u8,

crates/client/src/templates/trdelnik-tests/test.rs

@@ -1,7 +1,6 @@
 use fehler::throws;
-use program_client;
+use program_client::*;
 use trdelnik_client::{anyhow::Result, *};
-// @todo: do not forget to import your program crate (also in the ../Cargo.toml)
 
 // @todo: create and deploy your fixture
 #[throws]
@@ -41,5 +40,8 @@ impl Fixture {
         self.client
             .airdrop(self.client.payer().pubkey(), 5_000_000_000)
             .await?;
+        self.client
+            .deploy_by_name(&self.program.clone(), "###PROGRAM_NAME###")
+            .await?;
     }
 }

crates/client/src/test_generator.rs

@@ -35,6 +35,8 @@ pub enum Error {
     Commander(#[from] CommanderError),
     #[error("Cannot find the Anchor.toml file to locate the root folder")]
     BadWorkspace,
+    #[error("The Anchor project does not contain any programs")]
+    NoProgramsFound,
 }
 
 pub struct TestGenerator;
@@ -127,7 +129,14 @@ impl TestGenerator {
             env!("CARGO_MANIFEST_DIR"),
             "/src/templates/trdelnik-tests/test.rs"
         ));
-        self.create_file(&test_path, TESTS_FILE_NAME, test_content)
+        let program_libs = self.get_program_lib_names(root).await?;
+        let program_name = if let Some(name) = program_libs.first() {
+            name
+        } else {
+            throw!(Error::NoProgramsFound)
+        };
+        let test_content = test_content.replace("###PROGRAM_NAME###", program_name);
+        self.create_file(&test_path, TESTS_FILE_NAME, &test_content)
             .await?;
 
         let cargo_toml_path = workspace_path.join(CARGO_TOML);
@@ -155,7 +164,7 @@ impl TestGenerator {
         self.create_directory_all(&fuzzer_path, FUZZ_DIRECTORY)
             .await?;
 
-        let libs = self.get_libs(root).await?;
+        let libs = self.get_program_lib_names(root).await?;
 
         let fuzzer_test_path = fuzzer_path.join(FUZZ_TEST_FILE_NAME);
         let fuzz_test_content = include_str!(concat!(
@@ -166,11 +175,11 @@ impl TestGenerator {
 
         let fuzz_test_content = if let Some(lib) = libs.first() {
             let use_entry = format!("use {}::entry;\n", lib);
-            let prog_name = format!("const PROGRAM_NAME: &str  = \"{lib}\";\n");
             let use_instructions = format!("use program_client::{}_instruction::*;\n", lib);
-            format!("{use_entry}{use_instructions}{prog_name}{fuzz_test_content}")
+            let template = format!("{use_entry}{use_instructions}{fuzz_test_content}");
+            template.replace("###PROGRAM_NAME###", lib)
         } else {
-            fuzz_test_content
+            throw!(Error::NoProgramsFound)
         };
 
         self.create_file(&fuzzer_test_path, FUZZ_TEST_FILE_NAME, &fuzz_test_content)
@@ -385,7 +394,7 @@ impl TestGenerator {
     }
 
     /// Scans `programs` directory and returns a list of names of libraries
-    async fn get_libs(&self, root: &Path) -> Result<Vec<String>, Error> {
+    async fn get_program_lib_names(&self, root: &Path) -> Result<Vec<String>, Error> {
         let programs = root.join("programs");
         if !programs.exists() {
             println!("Programs folder does not exist.");
@@ -399,7 +408,6 @@ impl TestGenerator {
             if file.path().is_dir() {
                 let path = file.path().join(CARGO_TOML);
                 if path.exists() {
-                    // let dir = file_name.to_str().unwrap();
                     let content: Value = fs::read_to_string(&path).await?.parse()?;
                     let name = content
                         .get("lib")

examples/escrow/trdelnik-tests/tests/test.rs

@@ -1,6 +1,7 @@
 use anchor_spl::token;
 use fehler::throws;
-use program_client::escrow_instruction;
+use program_client::*;
+// use program_client::escrow_instruction;
 use trdelnik_client::{anyhow::Result, *};
 
 #[throws]