Skip to content

Commit 9b65c09

Browse files
fix
1 parent fd54f72 commit 9b65c09

File tree

7 files changed

+178
-205
lines changed

7 files changed

+178
-205
lines changed

packages/tokens/fungible/src/extensions/burnable/test.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ use stellar_event_assertion::EventAssertion;
77

88
use crate::{
99
extensions::{
10-
burnable::{emit_burn, storage::{burn, burn_from}},
10+
burnable::{
11+
emit_burn,
12+
storage::{burn, burn_from},
13+
},
1114
mintable::mint,
1215
},
1316
storage::{allowance, approve, balance, total_supply},
@@ -116,7 +119,7 @@ fn emit_burn_works() {
116119
e.as_contract(&address, || {
117120
// Directly test the emit_burn function
118121
emit_burn(&e, &account, 50);
119-
122+
120123
// Verify the event was emitted correctly
121124
let event_assert = EventAssertion::new(&e, address.clone());
122125
event_assert.assert_event_count(1);

packages/tokens/fungible/src/extensions/capped/test.rs

+12-9
Original file line numberDiff line numberDiff line change
@@ -130,28 +130,31 @@ fn test_cap_not_set() {
130130
e.as_contract(&token, || {
131131
// First verify the cap is not set by querying total supply
132132
assert_eq!(total_supply(&e), 0);
133-
134-
// Attempt to check cap without setting it first - should panic with CapNotSet (error code 208)
133+
134+
// Attempt to check cap without setting it first - should panic with CapNotSet
135+
// (error code 208)
135136
check_cap(&e, 100);
136-
137+
137138
// The following should never execute due to the panic
138-
assert!(false, "This code should not be reached");
139+
panic!("This code should not be reached");
139140
});
140141
}
141142

142143
#[test]
143144
fn test_query_cap_direct_error_path() {
144145
let e = Env::default();
145-
e.as_contract(&e.register_contract(None, TestToken), || {
146+
e.as_contract(&e.register(TestToken, ()), || {
146147
// Check the cap is initially unset
147-
let result: Option<i128> = e.storage().instance().get(&crate::extensions::capped::storage::CAP_KEY);
148+
let result: Option<i128> =
149+
e.storage().instance().get(&crate::extensions::capped::storage::CAP_KEY);
148150
assert_eq!(result, None);
149-
151+
150152
// Set a cap
151153
e.storage().instance().set(&crate::extensions::capped::storage::CAP_KEY, &1000_i128);
152-
154+
153155
// Verify the cap was set correctly
154-
let result: Option<i128> = e.storage().instance().get(&crate::extensions::capped::storage::CAP_KEY);
156+
let result: Option<i128> =
157+
e.storage().instance().get(&crate::extensions::capped::storage::CAP_KEY);
155158
assert_eq!(result, Some(1000_i128));
156159
});
157160
}

packages/tokens/fungible/src/extensions/metadata/test.rs

+17-17
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
extern crate std;
44

5-
use soroban_sdk::{contract, Env, IntoVal, String};
5+
use soroban_sdk::{contract, Env, String};
66

7-
use crate::extensions::metadata::storage::{decimals, name, set_metadata, symbol, Metadata, METADATA_KEY};
7+
use crate::extensions::metadata::storage::{
8+
decimals, name, set_metadata, symbol, Metadata, METADATA_KEY,
9+
};
810

911
#[contract]
1012
struct TestToken;
@@ -67,44 +69,42 @@ fn test_metadata_struct() {
6769
name: String::from_str(&e, "Test Token"),
6870
symbol: String::from_str(&e, "TST"),
6971
};
70-
72+
7173
// Store and retrieve to verify serialization
7274
e.storage().instance().set(&METADATA_KEY, &metadata1);
7375
let retrieved1: Metadata = e.storage().instance().get(&METADATA_KEY).unwrap();
74-
76+
7577
assert_eq!(retrieved1.decimals, 9);
7678
assert_eq!(retrieved1.name, String::from_str(&e, "Test Token"));
7779
assert_eq!(retrieved1.symbol, String::from_str(&e, "TST"));
78-
80+
7981
// Test case 2: Edge cases - empty strings and maximum decimal value
8082
let metadata2 = Metadata {
8183
decimals: u32::MAX,
8284
name: String::from_str(&e, ""),
8385
symbol: String::from_str(&e, ""),
8486
};
85-
87+
8688
// Store and retrieve edge case metadata
8789
e.storage().instance().set(&METADATA_KEY, &metadata2);
8890
let retrieved2: Metadata = e.storage().instance().get(&METADATA_KEY).unwrap();
89-
91+
9092
assert_eq!(retrieved2.decimals, u32::MAX);
9193
assert_eq!(retrieved2.name, String::from_str(&e, ""));
9294
assert_eq!(retrieved2.symbol, String::from_str(&e, ""));
93-
95+
9496
// Test case 3: Long strings
95-
let long_name = String::from_str(&e, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
97+
let long_name =
98+
String::from_str(&e, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
9699
let long_symbol = String::from_str(&e, "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB");
97-
98-
let metadata3 = Metadata {
99-
decimals: 0,
100-
name: long_name.clone(),
101-
symbol: long_symbol.clone(),
102-
};
103-
100+
101+
let metadata3 =
102+
Metadata { decimals: 0, name: long_name.clone(), symbol: long_symbol.clone() };
103+
104104
// Store and retrieve with long strings
105105
e.storage().instance().set(&METADATA_KEY, &metadata3);
106106
let retrieved3: Metadata = e.storage().instance().get(&METADATA_KEY).unwrap();
107-
107+
108108
assert_eq!(retrieved3.decimals, 0);
109109
assert_eq!(retrieved3.name, long_name);
110110
assert_eq!(retrieved3.symbol, long_symbol);

packages/tokens/fungible/src/extensions/mintable/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fn emit_mint_works() {
6363
e.as_contract(&address, || {
6464
// Directly test the emit_mint function
6565
emit_mint(&e, &account, 100);
66-
66+
6767
// Verify the event was emitted correctly
6868
let event_assert = EventAssertion::new(&e, address.clone());
6969
event_assert.assert_event_count(1);

packages/tokens/fungible/src/fungible_trait_test.rs

+9-15
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
#![cfg(test)]
2-
3-
extern crate std;
4-
51
use soroban_sdk::{contract, contractimpl, testutils::Address as _, Address, Env, IntoVal, String};
62

7-
use crate::fungible::FungibleToken;
8-
use crate::storage;
9-
use crate::mintable::mint;
3+
use crate::{fungible::FungibleToken, mintable::mint, storage};
104

115
#[contract]
126
pub struct TestToken;
@@ -57,40 +51,40 @@ impl FungibleToken for TestToken {
5751
fn test_fungible_token_trait() {
5852
let e = Env::default();
5953
e.mock_all_auths();
60-
54+
6155
let contract_id = e.register(TestToken, ());
6256
let client = TestTokenClient::new(&e, &contract_id);
6357
let user1 = Address::generate(&e);
6458
let user2 = Address::generate(&e);
65-
59+
6660
// Test implementation of the trait
67-
61+
6862
// Mint some tokens for testing (using the internal functions)
6963
e.as_contract(&contract_id, || {
7064
mint(&e, &user1, 1000);
7165
});
72-
66+
7367
// Test the trait functions
7468
assert_eq!(client.total_supply(), 1000);
7569
assert_eq!(client.balance(&user1), 1000);
7670
assert_eq!(client.balance(&user2), 0);
7771
assert_eq!(client.name(), "Test Token".into_val(&e));
7872
assert_eq!(client.symbol(), "TEST".into_val(&e));
7973
assert_eq!(client.decimals(), 7);
80-
74+
8175
// Test transfer function
8276
client.transfer(&user1, &user2, &300);
8377
assert_eq!(client.balance(&user1), 700);
8478
assert_eq!(client.balance(&user2), 300);
85-
79+
8680
// Test approve and allowance functions
8781
let expiration = e.ledger().sequence() + 1000;
8882
client.approve(&user1, &user2, &200, &expiration);
8983
assert_eq!(client.allowance(&user1, &user2), 200);
90-
84+
9185
// Test transfer_from function
9286
client.transfer_from(&user2, &user1, &user2, &100);
9387
assert_eq!(client.balance(&user1), 600);
9488
assert_eq!(client.balance(&user2), 400);
9589
assert_eq!(client.allowance(&user1, &user2), 100);
96-
}
90+
}
+17-29
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
1-
#![cfg(test)]
2-
3-
extern crate std;
4-
51
use soroban_sdk::{contract, testutils::Address as _, Address, Env};
62

73
use crate::storage::{AllowanceData, AllowanceKey, StorageKey};
84

95
#[contract]
6+
#[allow(dead_code)]
107
struct MockStorageContract;
118

129
#[test]
1310
fn test_allowance_key_struct() {
1411
let e = Env::default();
1512
let owner = Address::generate(&e);
1613
let spender = Address::generate(&e);
17-
14+
1815
// Test creating AllowanceKey
19-
let key = AllowanceKey {
20-
owner: owner.clone(),
21-
spender: spender.clone(),
22-
};
23-
16+
let key = AllowanceKey { owner: owner.clone(), spender: spender.clone() };
17+
2418
// Verify the struct fields
2519
assert_eq!(key.owner, owner);
2620
assert_eq!(key.spender, spender);
@@ -29,11 +23,8 @@ fn test_allowance_key_struct() {
2923
#[test]
3024
fn test_allowance_data_struct() {
3125
// Test creating AllowanceData
32-
let data = AllowanceData {
33-
amount: 100,
34-
live_until_ledger: 1000,
35-
};
36-
26+
let data = AllowanceData { amount: 100, live_until_ledger: 1000 };
27+
3728
// Verify the struct fields
3829
assert_eq!(data.amount, 100);
3930
assert_eq!(data.live_until_ledger, 1000);
@@ -45,34 +36,31 @@ fn test_storage_key_enum() {
4536
let address = Address::generate(&e);
4637
let owner = Address::generate(&e);
4738
let spender = Address::generate(&e);
48-
39+
4940
// Test TotalSupply variant
5041
let key1 = StorageKey::TotalSupply;
51-
42+
5243
// Test Balance variant
5344
let key2 = StorageKey::Balance(address);
54-
45+
5546
// Test Allowance variant
56-
let allowance_key = AllowanceKey {
57-
owner,
58-
spender,
59-
};
47+
let allowance_key = AllowanceKey { owner, spender };
6048
let key3 = StorageKey::Allowance(allowance_key);
61-
49+
6250
// Simple assertions to make sure the code executes
6351
// We're mostly verifying these can be created without errors
6452
match key1 {
65-
StorageKey::TotalSupply => assert!(true),
53+
StorageKey::TotalSupply => {}
6654
_ => panic!("Expected TotalSupply"),
6755
}
68-
56+
6957
match key2 {
70-
StorageKey::Balance(_) => assert!(true),
58+
StorageKey::Balance(_) => {}
7159
_ => panic!("Expected Balance"),
7260
}
73-
61+
7462
match key3 {
75-
StorageKey::Allowance(_) => assert!(true),
63+
StorageKey::Allowance(_) => {}
7664
_ => panic!("Expected Allowance"),
7765
}
78-
}
66+
}

0 commit comments

Comments
 (0)