Skip to content

Commit ef5f122

Browse files
committed
Use GRAM for Ton
Change Ton asset symbol from "TON" to "GRAM" in core primitives and update Android test mock accordingly; add a unit test for the Ton asset. Simplify and modernize several Rust test files: replace vec![..] usage with arrays for iterator construction, replace boolean match arms with matches! and assert! style assertions, and collapse a concatenated Solana test string into a single literal. These edits are test-focused refactors and a naming correction to keep asset metadata consistent.
1 parent 054ddcc commit ef5f122

7 files changed

Lines changed: 26 additions & 37 deletions

File tree

android/data/coordinators/src/test/kotlin/com/gemwallet/android/data/coordinators/transaction/TransactionDetailsAggregateImplTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ class TransactionDetailsAggregateImplTest {
5656

5757
private val tonAsset = mockAsset(
5858
chain = Chain.Ton,
59-
name = "Toncoin",
60-
symbol = "TON",
59+
name = "TON",
60+
symbol = "GRAM",
6161
decimals = 9,
6262
)
6363

@@ -214,7 +214,7 @@ class TransactionDetailsAggregateImplTest {
214214
val tonAsset = mockAsset(
215215
chain = Chain.SmartChain,
216216
tokenId = "0x76A797A59Ba2C17726896976B7B3747BfD1d220f",
217-
name = "Ton",
217+
name = "TON",
218218
symbol = "TON",
219219
decimals = 9,
220220
type = AssetType.BEP20,

core/apps/dynode/src/cache/memory.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ mod tests {
147147
}
148148

149149
fn create_test_cache() -> MemoryCache {
150-
let chains = vec![create_chain_config(Chain::Ethereum)];
150+
let chains = [create_chain_config(Chain::Ethereum)];
151151
MemoryCache::new(CacheConfig { max_memory_mb: 64 }, &create_test_chain_types(), chains.iter())
152152
}
153153

@@ -201,7 +201,7 @@ mod tests {
201201
}
202202
}))
203203
.unwrap();
204-
let chains = vec![create_chain_config(Chain::Ethereum)];
204+
let chains = [create_chain_config(Chain::Ethereum)];
205205
let cache = MemoryCache::new(CacheConfig { max_memory_mb: 64 }, &chain_types, chains.iter());
206206
let chain = Chain::Ethereum;
207207

@@ -264,7 +264,7 @@ mod tests {
264264
}
265265
}))
266266
.unwrap();
267-
let chains = vec![create_chain_config(Chain::Aptos)];
267+
let chains = [create_chain_config(Chain::Aptos)];
268268
let cache = MemoryCache::new(CacheConfig { max_memory_mb: 64 }, &chain_types, chains.iter());
269269
let chain = Chain::Aptos;
270270

@@ -305,7 +305,7 @@ mod tests {
305305
#[tokio::test]
306306
async fn test_eviction() {
307307
let config = CacheConfig { max_memory_mb: 0 };
308-
let chains = vec![create_chain_config(Chain::Ethereum)];
308+
let chains = [create_chain_config(Chain::Ethereum)];
309309
let cache = MemoryCache::new(config, &create_test_chain_types(), chains.iter());
310310
let chain = Chain::Ethereum;
311311

@@ -332,7 +332,7 @@ mod tests {
332332
}
333333
}))
334334
.unwrap();
335-
let chains = vec![create_chain_config(Chain::Tron)];
335+
let chains = [create_chain_config(Chain::Tron)];
336336
let cache = MemoryCache::new(CacheConfig { max_memory_mb: 64 }, &chain_types, chains.iter());
337337
let chain = Chain::Tron;
338338
let request_type = RequestType::Regular {
@@ -357,7 +357,7 @@ mod tests {
357357
inflight: false,
358358
params: HashMap::new(),
359359
}]);
360-
let chains = vec![chain_config];
360+
let chains = [chain_config];
361361
let cache = MemoryCache::new(CacheConfig { max_memory_mb: 64 }, &chain_types, chains.iter());
362362

363363
assert_eq!(

core/crates/gem_cosmos/src/provider/staking_mapper.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ mod tests {
232232
assert_eq!(validator.chain, Chain::Celestia);
233233
assert_eq!(validator.id, "celestiavaloper1eualhqh07w7p45g45hvrjagkcxsfnflzdw5jzg");
234234
assert_eq!(validator.name, "don't stake");
235-
assert_eq!(validator.is_active, false);
235+
assert!(!validator.is_active);
236236
assert_eq!(validator.commission, 20.0);
237237
assert_eq!(validator.apr, 0.0);
238238
}

core/crates/gem_solana/src/signer/instructions/stake.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ mod tests {
5151
const REFERENCE_STAKE_PRIVATE_KEY: &str = "AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746";
5252
const REFERENCE_STAKE_ACCOUNT: &str = "6XMLCn47d5kPi3g4YcjqFvDuxWnpVADpN2tXpeRc4XUB";
5353
const REFERENCE_VALIDATOR: &str = "4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC";
54-
const REFERENCE_DELEGATE_STAKE_TX: &str = concat!(
55-
"j24mVM9Zgu5vDZhPLGGuCRXQnP9djNtxdHh4txN3S7dwJsNNL5fbhzGpPgSUAcLGoMVCfF9TuqTYfpfJnb4sJFe1ahM8yPL5HwuKL6py5AZJFi8SWx9fvaVB699dCPo1GT3JoEBLPCZ9o2jQtnwzLkzTYJnKv2axqhKWFE2sz6TBA5J39eZcjMFUYgyxz6Q5S4MWqYQCb8UET2NAEZoKcfy7j8N25WXL6Gj4j3hBZjpHQQNaGaNEprEqyma3ZuVhpGiCALSsuzVLX3wZVo4icXwe952deMFA4tH3BK1jcSQCgfmcKDJ9nd7bdrnUUs4BoMdF1uDZB5LxE2UH8QiqtYvaUcorF4SJ3gPxM5ykbyPsNK1cSYZF9NMpW2GofyC17eELwnHQTQB2kqphxJZu7BahvkwiDPPeeydiXAkBspJ3nc3PCBujv6WJw22ZHw5j6zAP8ZGnCW44pqtWD5qifF9tTKhySKdANNiWifs3tSCCPQqjfJXu14drNinR6VG8rJxS1qgmRYiRQUa7m1vtoaZFRN5qKUeAfoFKkAVaNnMdwgsNqNH4dqBodTCJFs1LkYwhgRZdZGbwXTn1j7vpR3DSnv4g72i2H556srzK53jdUmdv6yfxt516XDSshqZtHnKZ1tudxKjBXwsqT3imDiZFVka9wKWUAYMCi4XZ79CY6Xpsd9c18U2e9TCngQmgkTATFgrqysfraokNffgqWxvsPMugksbvbPjJs3iCzByvphkC9p7hCf6LwbeF8XnVB91EAgRDA4VLE1f9wkcq5zjy879YWJ4r516h3PQszTz1EaJXNAXdbk5Em7eyuuabGP1Q3nijFTL2yhMDsXpgrjAuEAABNxFMd4J1JRMaic615mHrhwociksrsfQK"
56-
);
54+
const REFERENCE_DELEGATE_STAKE_TX: &str = "j24mVM9Zgu5vDZhPLGGuCRXQnP9djNtxdHh4txN3S7dwJsNNL5fbhzGpPgSUAcLGoMVCfF9TuqTYfpfJnb4sJFe1ahM8yPL5HwuKL6py5AZJFi8SWx9fvaVB699dCPo1GT3JoEBLPCZ9o2jQtnwzLkzTYJnKv2axqhKWFE2sz6TBA5J39eZcjMFUYgyxz6Q5S4MWqYQCb8UET2NAEZoKcfy7j8N25WXL6Gj4j3hBZjpHQQNaGaNEprEqyma3ZuVhpGiCALSsuzVLX3wZVo4icXwe952deMFA4tH3BK1jcSQCgfmcKDJ9nd7bdrnUUs4BoMdF1uDZB5LxE2UH8QiqtYvaUcorF4SJ3gPxM5ykbyPsNK1cSYZF9NMpW2GofyC17eELwnHQTQB2kqphxJZu7BahvkwiDPPeeydiXAkBspJ3nc3PCBujv6WJw22ZHw5j6zAP8ZGnCW44pqtWD5qifF9tTKhySKdANNiWifs3tSCCPQqjfJXu14drNinR6VG8rJxS1qgmRYiRQUa7m1vtoaZFRN5qKUeAfoFKkAVaNnMdwgsNqNH4dqBodTCJFs1LkYwhgRZdZGbwXTn1j7vpR3DSnv4g72i2H556srzK53jdUmdv6yfxt516XDSshqZtHnKZ1tudxKjBXwsqT3imDiZFVka9wKWUAYMCi4XZ79CY6Xpsd9c18U2e9TCngQmgkTATFgrqysfraokNffgqWxvsPMugksbvbPjJs3iCzByvphkC9p7hCf6LwbeF8XnVB91EAgRDA4VLE1f9wkcq5zjy879YWJ4r516h3PQszTz1EaJXNAXdbk5Em7eyuuabGP1Q3nijFTL2yhMDsXpgrjAuEAABNxFMd4J1JRMaic615mHrhwociksrsfQK";
5755
const REFERENCE_DEACTIVATE_STAKE_TX: &str = "6x3fSstNz4GpPxmT5jHXwyD62uyJMKaPWeBDNNcwXZA9NJ3E7KavCXPNUd8ZYTX5VpkfHKGszkwzM6AdAp4giLD29jvWdNYjkV1Nvb42xFwGD6ryMPZzXkJijaRTrA7SvPTDSRU2haGVmorqkywAXLQUCw47NmBUfLTb5gDcKoBeaAsahckv1eCE746thJVTg2dQNvUTULKF6xckUg7kwFkcUuRe4HCcRgrKcNAUKLR2rEM3brVQkUyAaAtMMtc3gVDXxxpbtW5Fa9wGaEnh31FdRo4z5YBzAUaz7vcrvzF2j81KCPTVnYyTmeJzCzJafzCVCtw";
5856
const REFERENCE_WITHDRAW_STAKE_TX: &str = "gxr4o1trVP8DGG8UC21AA964YqAPFA3rBCF9MwmBQpn5fDtcujM9wp1gzT466MxWGR8wMciS6dSL771q29eURrEEuvhJzRaFDGPLgVB3UL4gd4T2amPQkR4Dzq5drKEtPJRBR86KVVc2kjDsbWNpdL8S7pZqW3VUijAbm9TS8ezG8NExSCkhxExKhUjXWWguEL4qXra7s2JZfhtmvuJneWnEY3isUVfC9knWtGNwpNFvRvzbH2sgHzwtSsD7mkYrBJoazLCwT8r9yypxycHL41XcGtH425MA16kVSunvvBfzG9PzBTS65YJBs64tzttasCU9uEphkwgmfrmoEC8iKt8xD47Ra79RyXd95yURsaxvpb1tVAH8kMNtj8iV1Pfm";
5957

core/crates/primitives/src/asset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl Asset {
7676
Chain::Osmosis => chain.new_asset("Osmosis".to_string(), "OSMO".to_string(), 6, AssetType::NATIVE),
7777
Chain::Celestia => chain.new_asset("Celestia".to_string(), "TIA".to_string(), 6, AssetType::NATIVE),
7878
Chain::Arbitrum => chain.new_asset("Arbitrum ETH".to_string(), "ETH".to_string(), 18, AssetType::NATIVE),
79-
Chain::Ton => chain.new_asset("TON".to_string(), "TON".to_string(), 9, AssetType::NATIVE),
79+
Chain::Ton => chain.new_asset("TON".to_string(), "GRAM".to_string(), 9, AssetType::NATIVE),
8080
Chain::Tron => chain.new_asset("TRON".to_string(), "TRX".to_string(), 6, AssetType::NATIVE),
8181
Chain::Doge => chain.new_asset("Dogecoin".to_string(), "DOGE".to_string(), 8, AssetType::NATIVE),
8282
Chain::Zcash => chain.new_asset("Zcash".to_string(), "ZEC".to_string(), 8, AssetType::NATIVE),

core/crates/simulation/src/evm/decode.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,7 @@ mod tests {
267267
}
268268

269269
fn is_permit_warning(warning: &SimulationWarningType) -> bool {
270-
match warning {
271-
SimulationWarningType::PermitApproval(_) | SimulationWarningType::PermitBatchApproval(_) => true,
272-
_ => false,
273-
}
270+
matches!(warning, SimulationWarningType::PermitApproval(_) | SimulationWarningType::PermitBatchApproval(_))
274271
}
275272

276273
fn is_unlimited_permit_warning(warning: &SimulationWarningType) -> bool {
@@ -282,17 +279,11 @@ mod tests {
282279
}
283280

284281
fn is_token_warning(warning: &SimulationWarningType) -> bool {
285-
match warning {
286-
SimulationWarningType::TokenApproval(_) => true,
287-
_ => false,
288-
}
282+
matches!(warning, SimulationWarningType::TokenApproval(_))
289283
}
290284

291285
fn is_nft_warning(warning: &SimulationWarningType) -> bool {
292-
match warning {
293-
SimulationWarningType::NftCollectionApproval(_) => true,
294-
_ => false,
295-
}
286+
matches!(warning, SimulationWarningType::NftCollectionApproval(_))
296287
}
297288

298289
#[test]

core/crates/swapper/src/swapper.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -317,23 +317,23 @@ mod tests {
317317
let asset_id = AssetId::from_chain(Chain::Ethereum);
318318
let asset_id_usdt: AssetId = ETHEREUM_USDT_ASSET_ID.clone();
319319
let supported_assets_all = vec![SwapperChainAsset::All(Chain::Ethereum)];
320-
assert_eq!(GemSwapper::filter_supported_assets(supported_assets_all, asset_id.clone()), true);
321-
assert_eq!(
322-
GemSwapper::filter_supported_assets(vec![SwapperChainAsset::Assets(Chain::Cardano, vec![])], AssetId::from_chain(Chain::Cardano)),
323-
true
324-
);
325-
assert_eq!(
326-
GemSwapper::filter_supported_assets(vec![SwapperChainAsset::Assets(Chain::Cardano, vec![])], AssetId::from_token(Chain::Cardano, "policy.asset")),
327-
false
328-
);
320+
assert!(GemSwapper::filter_supported_assets(supported_assets_all, asset_id.clone()));
321+
assert!(GemSwapper::filter_supported_assets(
322+
vec![SwapperChainAsset::Assets(Chain::Cardano, vec![])],
323+
AssetId::from_chain(Chain::Cardano)
324+
));
325+
assert!(!GemSwapper::filter_supported_assets(
326+
vec![SwapperChainAsset::Assets(Chain::Cardano, vec![])],
327+
AssetId::from_token(Chain::Cardano, "policy.asset")
328+
));
329329

330330
let supported_assets = vec![
331331
SwapperChainAsset::All(Chain::Ethereum),
332332
SwapperChainAsset::Assets(Chain::Ethereum, vec![AssetId::from_token(Chain::Ethereum, &asset_id_usdt.clone().token_id.unwrap())]),
333333
];
334334

335-
assert_eq!(GemSwapper::filter_supported_assets(supported_assets.clone(), asset_id_usdt.clone()), true);
336-
assert_eq!(GemSwapper::filter_supported_assets(supported_assets, asset_id), true);
335+
assert!(GemSwapper::filter_supported_assets(supported_assets.clone(), asset_id_usdt.clone()));
336+
assert!(GemSwapper::filter_supported_assets(supported_assets, asset_id));
337337
}
338338

339339
#[tokio::test]

0 commit comments

Comments
 (0)