Rename zora_premint_v2 -> zora_premint

src/chain.rs

@@ -8,7 +8,7 @@ use futures_util::StreamExt;
 
 use crate::chain_list::{ChainListProvider, CHAINS};
 use crate::controller::{ControllerCommands, ControllerInterface};
-use crate::premints::zora_premint_v2::types::PREMINT_FACTORY_ADDR;
+use crate::premints::zora_premint::types::PREMINT_FACTORY_ADDR;
 use crate::types::{InclusionClaim, Premint, PremintTypes};
 
 pub async fn contract_call<T>(call: T, provider: &Arc<ChainListProvider>) -> eyre::Result<T::Return>

src/main.rs

@@ -1,6 +1,6 @@
 use clap::Parser;
 use mintpool::api;
-use mintpool::premints::zora_premint_v2::types::ZoraPremintV2;
+use mintpool::premints::zora_premint::types::ZoraPremintV2;
 use mintpool::rules::RulesEngine;
 use mintpool::run::{start_p2p_services, start_watch_chain};
 use mintpool::stdin::watch_stdin;

src/premints/mod.rs

@@ -1,2 +1,2 @@
 pub mod metadata;
-pub mod zora_premint_v2;
+pub mod zora_premint;

src/premints/zora_premint_v2/rules.rs → src/premints/zora_premint/rules.rs

@@ -4,7 +4,7 @@ use alloy_primitives::Signature;
 use alloy_sol_types::SolStruct;
 
 use crate::chain::contract_call;
-use crate::premints::zora_premint_v2::types::{IZoraPremintV2, ZoraPremintV2};
+use crate::premints::zora_premint::types::{IZoraPremintV2, ZoraPremintV2};
 use crate::rules::Evaluation::Accept;
 use crate::rules::{Evaluation, Rule, RuleContext};
 use crate::storage::Reader;

src/premints/zora_premint_v2/types.rs → src/premints/zora_premint/types.rs

@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use crate::premints::zora_premint_v2::types::IZoraPremintV2::PremintedV2;
+use crate::premints::zora_premint::types::IZoraPremintV2::PremintedV2;
 use crate::types::{InclusionClaim, Premint, PremintMetadata, PremintName};
 use alloy::rpc::types::eth::{Filter, Log, TransactionReceipt};
 use alloy::sol_types::private::U256;
@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
 sol! {
     #[derive(Debug, Serialize, Deserialize, PartialEq)]
     IZoraPremintV2,
-    "src/premints/zora_premint_v2/zora1155PremintExecutor.json"
+    "src/premints/zora_premint/zora1155PremintExecutor.json"
 }
 
 // aliasing the types here for readability. the original name need to stay

src/rules.rs

@@ -276,7 +276,7 @@ pub fn all_rules<T: Reader>() -> Vec<Box<dyn Rule<T>>> {
     let mut rules: Vec<Box<dyn Rule<T>>> = Vec::new();
 
     rules.append(&mut general::all_rules());
-    rules.append(&mut crate::premints::zora_premint_v2::rules::all_rules());
+    rules.append(&mut crate::premints::zora_premint::rules::all_rules());
 
     rules
 }
@@ -455,7 +455,7 @@ mod general {
 
 #[cfg(test)]
 mod test {
-    use crate::premints::zora_premint_v2::types::ZoraPremintV2;
+    use crate::premints::zora_premint::types::ZoraPremintV2;
     use crate::rules::general::existing_token_uri;
     use crate::rules::Evaluation::{Accept, Reject};
     use crate::storage::{PremintStorage, Writer};

src/storage.rs

@@ -317,7 +317,7 @@ mod test {
     use sqlx::Row;
 
     use crate::config::Config;
-    use crate::premints::zora_premint_v2::types::ZoraPremintV2;
+    use crate::premints::zora_premint::types::ZoraPremintV2;
     use crate::storage;
     use crate::storage::{
         list_all, list_all_with_options, PremintStorage, QueryOptions, Reader, Writer,

src/types.rs

@@ -1,4 +1,4 @@
-use crate::premints::zora_premint_v2::types::ZoraPremintV2;
+use crate::premints::zora_premint::types::ZoraPremintV2;
 use alloy::rpc::types::eth::{Filter, Log, TransactionReceipt};
 use alloy_primitives::{Address, B256, U256};
 use async_trait::async_trait;
@@ -178,10 +178,10 @@ pub struct PeerInclusionClaim {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::premints::zora_premint_v2::types::IZoraPremintV2::{
+    use crate::premints::zora_premint::types::IZoraPremintV2::{
         ContractCreationConfig, CreatorAttribution, TokenCreationConfig,
     };
-    use crate::premints::zora_premint_v2::types::{IZoraPremintV2, PREMINT_FACTORY_ADDR};
+    use crate::premints::zora_premint::types::{IZoraPremintV2, PREMINT_FACTORY_ADDR};
     use alloy::rpc::types::eth::ReceiptEnvelope;
     use alloy_primitives::{Bytes, LogData};
     use alloy_sol_types::SolEvent;

tests/e2e_test.rs

@@ -19,8 +19,8 @@ use alloy_transport::TransportErrorKind;
 use mintpool::api::admin::node_info;
 use mintpool::config::{ChainInclusionMode, Config};
 use mintpool::controller::{ControllerCommands, DBQuery};
-use mintpool::premints::zora_premint_v2::types::IZoraPremintV2::MintArguments;
-use mintpool::premints::zora_premint_v2::types::{
+use mintpool::premints::zora_premint::types::IZoraPremintV2::MintArguments;
+use mintpool::premints::zora_premint::types::{
     IZoraPremintV2, ZoraPremintV2, PREMINT_FACTORY_ADDR,
 };
 use mintpool::rules::RulesEngine;