Skip to content

Commit aed23cf

Browse files
armandocodecrarmandocodecr
committed
refactor: rename platform_address to platform for consistency across the codebase
1 parent ad9843e commit aed23cf

11 files changed

Lines changed: 74 additions & 74 deletions

File tree

‎contracts/escrow/src/contract.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ impl EscrowContract {
124124

125125
pub fn extend_contract_ttl(
126126
e: &Env,
127-
platform_address: Address,
127+
platform: Address,
128128
ledgers_to_extend: u32,
129129
) -> Result<(), ContractError> {
130-
platform_address.require_auth();
130+
platform.require_auth();
131131

132132
let escrow = EscrowManager::get_escrow(e)?;
133-
if platform_address != escrow.roles.platform_address {
133+
if platform != escrow.roles.platform {
134134
return Err(ContractError::OnlyPlatformAddressExecuteThisFunction);
135135
}
136136

@@ -140,7 +140,7 @@ impl EscrowContract {
140140
.extend_ttl(&DataKey::Escrow, min_ledgers, ledgers_to_extend);
141141

142142
ExtTtlEvt {
143-
platform: platform_address,
143+
platform: platform,
144144
ledgers_to_extend,
145145
}
146146
.publish(e);

‎contracts/escrow/src/core/dispute.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl DisputeManager {
6767
if fee_result.platform_fee > 0 {
6868
token_client.transfer(
6969
&contract_address,
70-
&escrow.roles.platform_address,
70+
&escrow.roles.platform,
7171
&fee_result.platform_fee,
7272
);
7373
}
@@ -139,7 +139,7 @@ impl DisputeManager {
139139
if fee_result.platform_fee > 0 {
140140
token_client.transfer(
141141
&contract_address,
142-
&escrow.roles.platform_address,
142+
&escrow.roles.platform,
143143
&fee_result.platform_fee,
144144
);
145145
}

‎contracts/escrow/src/core/escrow.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl EscrowManager {
8888
}
8989

9090
if fee_result.platform_fee > 0 {
91-
token_client.transfer(&contract_address, &escrow.roles.platform_address, &fee_result.platform_fee);
91+
token_client.transfer(&contract_address, &escrow.roles.platform, &fee_result.platform_fee);
9292
}
9393

9494
let receiver = Self::get_receiver(&milestone);
@@ -104,7 +104,7 @@ impl EscrowManager {
104104

105105
pub fn change_escrow_properties(
106106
e: &Env,
107-
platform_address: Address,
107+
platform: Address,
108108
escrow_properties: Escrow,
109109
) -> Result<Escrow, ContractError> {
110110
let escrow = EscrowManager::get_escrow(e)?;
@@ -114,12 +114,12 @@ impl EscrowManager {
114114
validate_escrow_property_change_conditions(
115115
&escrow,
116116
&escrow_properties,
117-
&platform_address,
117+
&platform,
118118
contract_balance,
119119
escrow.milestones.clone(),
120120
)?;
121121

122-
platform_address.require_auth();
122+
platform.require_auth();
123123

124124
e.storage()
125125
.persistent()

‎contracts/escrow/src/core/validators/dispute.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ pub fn validate_dispute_flag_change_conditions(
114114
let Roles {
115115
approver,
116116
service_provider,
117-
platform_address,
117+
platform,
118118
release_signer,
119119
dispute_resolver,
120120
} = &escrow.roles;
121121

122122
let is_authorized = signer == approver
123123
|| signer == service_provider
124-
|| signer == platform_address
124+
|| signer == platform
125125
|| signer == release_signer
126126
|| signer == dispute_resolver
127127
|| signer == &milestone.receiver;

‎contracts/escrow/src/core/validators/escrow.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn validate_release_conditions(
4040
fn validate_escrow_conditions(
4141
existing_escrow: Option<&Escrow>,
4242
new_escrow: &Escrow,
43-
platform_address: Option<&Address>,
43+
platform: Option<&Address>,
4444
contract_balance: Option<i128>,
4545
is_init: bool,
4646
) -> Result<(), ContractError> {
@@ -74,11 +74,11 @@ fn validate_escrow_conditions(
7474
} else {
7575
let existing = existing_escrow.ok_or(ContractError::EscrowNotFound)?;
7676
let caller =
77-
platform_address.ok_or(ContractError::OnlyPlatformAddressExecuteThisFunction)?;
78-
if caller != &existing.roles.platform_address {
77+
platform.ok_or(ContractError::OnlyPlatformAddressExecuteThisFunction)?;
78+
if caller != &existing.roles.platform {
7979
return Err(ContractError::OnlyPlatformAddressExecuteThisFunction);
8080
}
81-
if existing.roles.platform_address != new_escrow.roles.platform_address {
81+
if existing.roles.platform != new_escrow.roles.platform {
8282
return Err(ContractError::PlatformAddressCannotBeChanged);
8383
}
8484

@@ -133,14 +133,14 @@ fn validate_escrow_conditions(
133133
pub fn validate_escrow_property_change_conditions(
134134
existing_escrow: &Escrow,
135135
new_escrow: &Escrow,
136-
platform_address: &Address,
136+
platform: &Address,
137137
contract_balance: i128,
138138
_milestones: Vec<Milestone>,
139139
) -> Result<(), ContractError> {
140140
validate_escrow_conditions(
141141
Some(existing_escrow),
142142
new_escrow,
143-
Some(platform_address),
143+
Some(platform),
144144
Some(contract_balance),
145145
false,
146146
)

‎contracts/escrow/src/storage/types.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub struct MilestoneUpdate {
3737
pub struct Roles {
3838
pub approver: Address,
3939
pub service_provider: Address,
40-
pub platform_address: Address,
40+
pub platform: Address,
4141
pub release_signer: Address,
4242
pub dispute_resolver: Address,
4343
}

‎contracts/escrow/src/tests/balance.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fn test_withdraw_remaining_funds_success() {
2424
let roles = Roles {
2525
approver: approver.clone(),
2626
service_provider: service_provider.clone(),
27-
platform_address: platform.clone(),
27+
platform: platform.clone(),
2828
release_signer: release_signer.clone(),
2929
dispute_resolver: dispute_resolver.clone(),
3030
};
@@ -151,7 +151,7 @@ fn test_withdraw_remaining_funds_unauthorized() {
151151
let roles = Roles {
152152
approver: approver.clone(),
153153
service_provider: service_provider.clone(),
154-
platform_address: platform.clone(),
154+
platform: platform.clone(),
155155
release_signer: release_signer.clone(),
156156
dispute_resolver: dispute_resolver.clone(),
157157
};
@@ -218,7 +218,7 @@ fn test_withdraw_remaining_funds_not_fully_processed() {
218218
let roles = Roles {
219219
approver: approver.clone(),
220220
service_provider: service_provider.clone(),
221-
platform_address: platform.clone(),
221+
platform: platform.clone(),
222222
release_signer: release_signer.clone(),
223223
dispute_resolver: dispute_resolver.clone(),
224224
};
@@ -297,7 +297,7 @@ fn test_withdraw_remaining_funds_zero_balance_ok() {
297297
let roles = Roles {
298298
approver: approver.clone(),
299299
service_provider: service_provider.clone(),
300-
platform_address: platform.clone(),
300+
platform: platform.clone(),
301301
release_signer: release_signer.clone(),
302302
dispute_resolver: dispute_resolver.clone(),
303303
};

‎contracts/escrow/src/tests/dispute.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn test_dispute_management() {
1313
let admin = Address::generate(&env);
1414
let approver_address = Address::generate(&env);
1515
let service_provider_address = Address::generate(&env);
16-
let platform_address = Address::generate(&env);
16+
let platform = Address::generate(&env);
1717
let release_signer_address = Address::generate(&env);
1818
let dispute_resolver_address = Address::generate(&env);
1919

@@ -25,7 +25,7 @@ fn test_dispute_management() {
2525
let roles: Roles = Roles {
2626
approver: approver_address.clone(),
2727
service_provider: service_provider_address.clone(),
28-
platform_address: platform_address.clone(),
28+
platform: platform.clone(),
2929
release_signer: release_signer_address.clone(),
3030
dispute_resolver: dispute_resolver_address.clone(),
3131
};
@@ -87,7 +87,7 @@ fn test_dispute_management() {
8787
usdc_token.1.mint(&approver_address, &(amount as i128));
8888
// Test block on distributing earnings during dispute
8989
let result =
90-
escrow_approver.try_release_milestone_funds(&release_signer_address, &platform_address, &0);
90+
escrow_approver.try_release_milestone_funds(&release_signer_address, &platform, &0);
9191
assert!(result.is_err());
9292

9393
let _ = escrow_approver.try_dispute_milestone(&0, &approver_address);
@@ -111,7 +111,7 @@ fn test_dispute_resolution_process() {
111111
let approver_address = Address::generate(&env);
112112
let admin = Address::generate(&env);
113113
let service_provider_address = Address::generate(&env);
114-
let platform_address = Address::generate(&env);
114+
let platform = Address::generate(&env);
115115
let release_signer_address = Address::generate(&env);
116116
let dispute_resolver_address = Address::generate(&env);
117117
let trustless_work_address = Address::generate(&env);
@@ -123,7 +123,7 @@ fn test_dispute_resolution_process() {
123123
let roles: Roles = Roles {
124124
approver: approver_address.clone(),
125125
service_provider: service_provider_address.clone(),
126-
platform_address: platform_address.clone(),
126+
platform: platform.clone(),
127127
release_signer: release_signer_address.clone(),
128128
dispute_resolver: dispute_resolver_address.clone(),
129129
};
@@ -213,7 +213,7 @@ fn test_dispute_resolution_process() {
213213
expected_tw_fee
214214
);
215215
assert_eq!(
216-
usdc_token.0.balance(&platform_address),
216+
usdc_token.0.balance(&platform),
217217
expected_platform_fee
218218
);
219219
assert_eq!(usdc_token.0.balance(&approver_address), expected_approver);
@@ -250,7 +250,7 @@ fn test_cannot_release_after_dispute_resolved() {
250250
let roles = Roles {
251251
approver: approver.clone(),
252252
service_provider: service_provider.clone(),
253-
platform_address: platform.clone(),
253+
platform: platform.clone(),
254254
release_signer: release_signer.clone(),
255255
dispute_resolver: dispute_resolver.clone(),
256256
};
@@ -330,7 +330,7 @@ fn test_cannot_dispute_resolve_after_released() {
330330
let roles = Roles {
331331
approver: approver.clone(),
332332
service_provider: service_provider.clone(),
333-
platform_address: platform.clone(),
333+
platform: platform.clone(),
334334
release_signer: release_signer.clone(),
335335
dispute_resolver: dispute_resolver.clone(),
336336
};
@@ -399,7 +399,7 @@ fn test_dispute_milestone() {
399399
let approver_address = Address::generate(&env);
400400
let admin = Address::generate(&env);
401401
let service_provider_address = Address::generate(&env);
402-
let platform_address = Address::generate(&env);
402+
let platform = Address::generate(&env);
403403
let release_signer_address = Address::generate(&env);
404404
let dispute_resolver_address = Address::generate(&env);
405405
let platform_fee = 3 * 100;
@@ -409,7 +409,7 @@ fn test_dispute_milestone() {
409409
let roles: Roles = Roles {
410410
approver: approver_address.clone(),
411411
service_provider: service_provider_address.clone(),
412-
platform_address: platform_address.clone(),
412+
platform: platform.clone(),
413413
release_signer: release_signer_address.clone(),
414414
dispute_resolver: dispute_resolver_address.clone(),
415415
};
@@ -494,7 +494,7 @@ fn test_change_dispute_flag_authorized_and_unauthorized() {
494494
let admin = Address::generate(&env);
495495
let approver = Address::generate(&env);
496496
let service_provider = Address::generate(&env);
497-
let platform_address = Address::generate(&env);
497+
let platform = Address::generate(&env);
498498
let release_signer = Address::generate(&env);
499499
let dispute_resolver = Address::generate(&env);
500500
let unauthorized = Address::generate(&env);
@@ -506,7 +506,7 @@ fn test_change_dispute_flag_authorized_and_unauthorized() {
506506
let roles: Roles = Roles {
507507
approver: approver.clone(),
508508
service_provider: service_provider.clone(),
509-
platform_address,
509+
platform,
510510
release_signer,
511511
dispute_resolver,
512512
};

‎contracts/escrow/src/tests/escrow.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fn test_initialize_escrow_rejects_platform_fee_exceeding_aggregate_cap() {
1111

1212
let approver_address = Address::generate(&env);
1313
let admin = Address::generate(&env);
14-
let platform_address = Address::generate(&env);
14+
let platform = Address::generate(&env);
1515
let service_provider_address = Address::generate(&env);
1616
let release_signer_address = Address::generate(&env);
1717
let dispute_resolver_address = Address::generate(&env);
@@ -22,7 +22,7 @@ fn test_initialize_escrow_rejects_platform_fee_exceeding_aggregate_cap() {
2222
let roles: Roles = Roles {
2323
approver: approver_address.clone(),
2424
service_provider: service_provider_address.clone(),
25-
platform_address: platform_address.clone(),
25+
platform: platform.clone(),
2626
release_signer: release_signer_address.clone(),
2727
dispute_resolver: dispute_resolver_address.clone(),
2828
};
@@ -78,7 +78,7 @@ fn test_change_escrow_rejects_platform_fee_exceeding_aggregate_cap() {
7878

7979
let approver_address = Address::generate(&env);
8080
let admin = Address::generate(&env);
81-
let platform_address = Address::generate(&env);
81+
let platform = Address::generate(&env);
8282
let service_provider_address = Address::generate(&env);
8383
let release_signer_address = Address::generate(&env);
8484
let dispute_resolver_address = Address::generate(&env);
@@ -88,7 +88,7 @@ fn test_change_escrow_rejects_platform_fee_exceeding_aggregate_cap() {
8888
let roles: Roles = Roles {
8989
approver: approver_address.clone(),
9090
service_provider: service_provider_address.clone(),
91-
platform_address: platform_address.clone(),
91+
platform: platform.clone(),
9292
release_signer: release_signer_address.clone(),
9393
dispute_resolver: dispute_resolver_address.clone(),
9494
};
@@ -140,7 +140,7 @@ fn test_change_escrow_rejects_platform_fee_exceeding_aggregate_cap() {
140140
..escrow_properties
141141
};
142142

143-
let res = client.try_update_escrow(&platform_address, &updated_escrow_properties);
143+
let res = client.try_update_escrow(&platform, &updated_escrow_properties);
144144
assert!(res.is_err());
145145
}
146146

@@ -150,7 +150,7 @@ fn test_initialize_escrow() {
150150

151151
let approver_address = Address::generate(&env);
152152
let admin = Address::generate(&env);
153-
let platform_address = Address::generate(&env);
153+
let platform = Address::generate(&env);
154154
let service_provider_address = Address::generate(&env);
155155
let release_signer_address = Address::generate(&env);
156156
let dispute_resolver_address = Address::generate(&env);
@@ -162,7 +162,7 @@ fn test_initialize_escrow() {
162162
let roles: Roles = Roles {
163163
approver: approver_address.clone(),
164164
service_provider: service_provider_address.clone(),
165-
platform_address: platform_address.clone(),
165+
platform: platform.clone(),
166166
release_signer: release_signer_address.clone(),
167167
dispute_resolver: dispute_resolver_address.clone(),
168168
};
@@ -223,8 +223,8 @@ fn test_initialize_escrow() {
223223
escrow_properties.roles.service_provider
224224
);
225225
assert_eq!(
226-
escrow.roles.platform_address,
227-
escrow_properties.roles.platform_address
226+
escrow.roles.platform,
227+
escrow_properties.roles.platform
228228
);
229229
assert_eq!(escrow.platform_fee, platform_fee);
230230
assert_eq!(escrow.milestones, escrow_properties.milestones);
@@ -248,7 +248,7 @@ fn test_update_escrow() {
248248

249249
let approver_address = Address::generate(&env);
250250
let admin = Address::generate(&env);
251-
let platform_address = Address::generate(&env);
251+
let platform = Address::generate(&env);
252252
let service_provider_address = Address::generate(&env);
253253
let release_signer_address = Address::generate(&env);
254254
let dispute_resolver_address = Address::generate(&env);
@@ -261,7 +261,7 @@ fn test_update_escrow() {
261261
let roles: Roles = Roles {
262262
approver: approver_address.clone(),
263263
service_provider: service_provider_address.clone(),
264-
platform_address: platform_address.clone(),
264+
platform: platform.clone(),
265265
release_signer: release_signer_address.clone(),
266266
dispute_resolver: dispute_resolver_address.clone(),
267267
};
@@ -356,7 +356,7 @@ fn test_update_escrow() {
356356

357357
// Update escrow properties
358358
let _updated_escrow =
359-
escrow_approver.update_escrow(&platform_address, &updated_escrow_properties);
359+
escrow_approver.update_escrow(&platform, &updated_escrow_properties);
360360

361361
// Verify updated escrow properties
362362
let escrow = escrow_approver.get_escrow();

0 commit comments

Comments
 (0)