instantiator tests

Polimec · Apr 18, 2024 · 77acc93 · 77acc93
1 parent 96baf54
commit 77acc93
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/pallets/funding/src/instantiator/mod.rs b/pallets/funding/src/instantiator/mod.rs
@@ -53,6 +53,7 @@ use sp_std::{
 };
 
 pub mod macros;
+<<<<<<< HEAD
 pub use macros::*;
 pub mod types;
 pub use types::*;
@@ -61,6 +62,25 @@ pub use traits::*;
 #[cfg(feature = "std")]
 pub mod async_features;
 mod functions;
+=======
+<<<<<<< HEAD
+pub mod types;
+<<<<<<< HEAD
+#[cfg(feature = "std")]
+pub mod async_features;
+mod traits;
+=======
+mod async_features;
+=======
+<<<<<<< HEAD
+mod types;
+=======
+mod tests;
+>>>>>>> 38725a29 (instantiator tests)
+>>>>>>> 8ef65884 (instantiator tests)
+
+>>>>>>> e7bc8a12 (instantiator tests)
+>>>>>>> ffb38372 (instantiator tests)
 
 
 

diff --git a/pallets/funding/src/instantiator/tests.rs b/pallets/funding/src/instantiator/tests.rs