Move currencies module to utils

src/config.rs

@@ -12,12 +12,12 @@ use crate::activitypub::constants::ACTOR_KEY_SUFFIX;
 use crate::activitypub::identifiers::local_instance_actor_id;
 use crate::errors::ConversionError;
 use crate::ethereum::utils::{parse_caip2_chain_id, ChainIdError};
-use crate::models::profiles::currencies::Currency;
 use crate::utils::crypto::{
     deserialize_private_key,
     generate_private_key,
     serialize_private_key,
 };
+use crate::utils::currencies::Currency;
 use crate::utils::files::{set_file_permissions, write_file};
 
 #[derive(Clone, Debug)]

src/ethereum/identity.rs

@@ -7,7 +7,7 @@ use serde::{
 };
 
 use crate::errors::ValidationError;
-use crate::models::profiles::currencies::Currency;
+use crate::utils::currencies::Currency;
 use super::signatures::recover_address;
 use super::utils::address_to_string;
 

src/ethereum/subscriptions.rs

@@ -22,7 +22,6 @@ use crate::models::notifications::queries::{
     create_subscription_notification,
     create_subscription_expiration_notification,
 };
-use crate::models::profiles::currencies::Currency;
 use crate::models::profiles::queries::{
     get_profile_by_id,
     search_profile_by_wallet_address,
@@ -38,6 +37,7 @@ use crate::models::users::queries::{
     get_user_by_id,
     get_user_by_wallet_address,
 };
+use crate::utils::currencies::Currency;
 use super::contracts::ContractSet;
 use super::errors::EthereumError;
 use super::signatures::{

src/mastodon_api/accounts/types.rs

@@ -6,7 +6,6 @@ use uuid::Uuid;
 
 use crate::errors::ValidationError;
 use crate::frontend::get_subscription_page_url;
-use crate::models::profiles::currencies::get_identity_proof_field_name;
 use crate::models::profiles::types::{
     DbActorProfile,
     ExtraField,
@@ -20,6 +19,7 @@ use crate::models::users::types::{
     validate_local_username,
     User,
 };
+use crate::utils::currencies::get_identity_proof_field_name;
 use crate::utils::files::{FileError, save_validated_b64_file, get_file_url};
 
 /// https://docs.joinmastodon.org/entities/field/

src/models/profiles/mod.rs

@@ -1,4 +1,3 @@
-pub mod currencies;
 pub mod queries;
 pub mod types;
 pub mod validators;

src/models/profiles/queries.rs

@@ -10,8 +10,8 @@ use crate::models::cleanup::{
     DeletionQueue,
 };
 use crate::models::relationships::types::RelationshipType;
+use crate::utils::currencies::{get_currency_field_name, Currency};
 use crate::utils::id::new_uuid;
-use super::currencies::{get_currency_field_name, Currency};
 use super::types::{
     DbActorProfile,
     ExtraFields,

src/utils/mod.rs

@@ -1,4 +1,5 @@
 pub mod crypto;
+pub mod currencies;
 pub mod files;
 pub mod html;
 pub mod id;