Skip to content
This repository was archived by the owner on Feb 3, 2025. It is now read-only.

Commit 746588d

Browse files
Merge pull request #1226 from MutinyWallet/rm-gateway-fees
Don't block on gateway fees
2 parents b11e68d + 2bca2cc commit 746588d

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

mutiny-core/src/federation.rs

-6
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ pub struct FederationIdentity {
160160
pub federation_name: Option<String>,
161161
pub federation_expiry_timestamp: Option<String>,
162162
pub welcome_message: Option<String>,
163-
pub gateway_fees: Option<GatewayFees>,
164163
// undocumented parameters that fedi uses: https://meta.dev.fedibtc.com/meta.json
165164
pub federation_icon_url: Option<String>,
166165
pub meta_external_url: Option<String>,
@@ -873,12 +872,10 @@ impl<S: MutinyStorage> FederationClient<S> {
873872
}
874873

875874
pub async fn get_mutiny_federation_identity(&self) -> FederationIdentity {
876-
let gateway_fees = self.gateway_fee().await.ok();
877875
get_federation_identity(
878876
self.uuid.clone(),
879877
self.fedimint_client.clone(),
880878
self.invite_code.clone(),
881-
gateway_fees,
882879
self.logger.clone(),
883880
)
884881
.await
@@ -895,8 +892,6 @@ pub(crate) async fn get_federation_identity(
895892
uuid: String,
896893
fedimint_client: ClientHandleArc,
897894
invite_code: InviteCode,
898-
gateway_fees: Option<GatewayFees>,
899-
900895
logger: Arc<MutinyLogger>,
901896
) -> FederationIdentity {
902897
let federation_id = fedimint_client.federation_id();
@@ -950,7 +945,6 @@ pub(crate) async fn get_federation_identity(
950945
fedimint_client.get_meta("welcome_message"),
951946
config.as_ref().and_then(|c| c.welcome_message.clone()),
952947
),
953-
gateway_fees, // Already merged using helper function...
954948
federation_icon_url: merge_values(
955949
fedimint_client.get_meta("federation_icon_url"),
956950
config.as_ref().and_then(|c| c.federation_icon_url.clone()),

mutiny-core/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -3804,13 +3804,11 @@ pub(crate) async fn create_new_federation<S: MutinyStorage>(
38043804
storage.insert_federations(federation_mutex.clone()).await?;
38053805

38063806
let federation_id = new_federation.fedimint_client.federation_id();
3807-
let gateway_fees = new_federation.gateway_fee().await.ok();
38083807

38093808
let new_federation_identity = get_federation_identity(
38103809
next_federation_uuid.clone(),
38113810
new_federation.fedimint_client.clone(),
38123811
federation_code.clone(),
3813-
gateway_fees,
38143812
logger.clone(),
38153813
)
38163814
.await;

0 commit comments

Comments
 (0)