|
|
@ -32,7 +32,7 @@ async fn test_bank_items_sent_in_character_login() { |
|
|
|
),
|
|
|
|
}).await.unwrap();
|
|
|
|
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![item]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![item]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -71,7 +71,7 @@ async fn test_request_bank_items() { |
|
|
|
}).await.unwrap());
|
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -115,7 +115,7 @@ async fn test_request_stacked_bank_items() { |
|
|
|
}).await.unwrap());
|
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![monomates]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![monomates]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -182,7 +182,7 @@ async fn test_request_bank_items_sorted() { |
|
|
|
}).await.unwrap();
|
|
|
|
|
|
|
|
let bank = vec![item::BankItemEntity::Individual(item1), vec![monomate].into(), item2.into()];
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -275,7 +275,13 @@ async fn test_deposit_individual_item() { |
|
|
|
&& player_no_longer_has_item.amount == 0
|
|
|
|
));
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let inventory_items = entity_gateway.get_character_inventory(&char1.id).await.unwrap();
|
|
|
|
assert_eq!(inventory_items.items.len(), 1);
|
|
|
|
inventory_items.items[0].with_individual(|item| {
|
|
|
|
assert_eq!(item.id, item::ItemEntityId(1));
|
|
|
|
}).unwrap();
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 1);
|
|
|
|
bank_items.items[0].with_individual(|item| {
|
|
|
|
assert_eq!(item.id, item::ItemEntityId(2));
|
|
|
@ -335,7 +341,7 @@ async fn test_deposit_stacked_item() { |
|
|
|
&& player_no_longer_has_item.amount == 3
|
|
|
|
));
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 1);
|
|
|
|
bank_items.items[0].with_stacked(|items| {
|
|
|
|
assert_eq!(items.iter().map(|i| i.id).collect::<Vec<_>>(),
|
|
|
@ -397,7 +403,7 @@ async fn test_deposit_partial_stacked_item() { |
|
|
|
));
|
|
|
|
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 1);
|
|
|
|
bank_items.items[0].with_stacked(|items| {
|
|
|
|
assert_eq!(items.iter().map(|i| i.id).collect::<Vec<_>>(),
|
|
|
@ -443,7 +449,7 @@ async fn test_deposit_stacked_item_with_stack_already_in_bank() { |
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_inventory(&char1.id, &item::InventoryEntity::new(vec![inventory_monomates])).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_monomates]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_monomates]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -477,7 +483,7 @@ async fn test_deposit_stacked_item_with_stack_already_in_bank() { |
|
|
|
&& player_no_longer_has_item.amount == 2
|
|
|
|
));
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 1);
|
|
|
|
bank_items.items[0].with_stacked(|items| {
|
|
|
|
assert_eq!(items.iter().map(|i| i.id).collect::<BTreeSet<_>>(),
|
|
|
@ -516,7 +522,7 @@ async fn test_deposit_stacked_item_with_full_stack_in_bank() { |
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_inventory(&char1.id, &item::InventoryEntity::new(vec![inventory_monomates])).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_monomates]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_monomates]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -543,7 +549,7 @@ async fn test_deposit_stacked_item_with_full_stack_in_bank() { |
|
|
|
|
|
|
|
assert!(packets.is_err());
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 1);
|
|
|
|
bank_items.items[0].with_stacked(|items| {
|
|
|
|
assert_eq!(items.len(), 10);
|
|
|
@ -596,7 +602,7 @@ async fn test_deposit_individual_item_in_full_bank() { |
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_inventory(&char1.id, &item::InventoryEntity::new(inventory)).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -623,7 +629,7 @@ async fn test_deposit_individual_item_in_full_bank() { |
|
|
|
|
|
|
|
assert!(packets.is_err());
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 200);
|
|
|
|
|
|
|
|
let inventory_items = entity_gateway.get_character_inventory(&char1.id).await.unwrap();
|
|
|
@ -669,7 +675,7 @@ async fn test_deposit_stacked_item_in_full_bank() { |
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_inventory(&char1.id, &item::InventoryEntity::new(vec![monomates])).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(full_bank), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(full_bank), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -696,7 +702,7 @@ async fn test_deposit_stacked_item_in_full_bank() { |
|
|
|
|
|
|
|
assert!(packets.is_err());
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 200);
|
|
|
|
|
|
|
|
let inventory_items = entity_gateway.get_character_inventory(&char1.id).await.unwrap();
|
|
|
@ -756,7 +762,7 @@ async fn test_deposit_stacked_item_in_full_bank_with_partial_stack() { |
|
|
|
almost_full_bank.push(bank_monomates.into());
|
|
|
|
|
|
|
|
entity_gateway.set_character_inventory(&char1.id, &item::InventoryEntity::new(vec![monomates])).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(almost_full_bank), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(almost_full_bank), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -781,7 +787,7 @@ async fn test_deposit_stacked_item_in_full_bank_with_partial_stack() { |
|
|
|
unknown: 0,
|
|
|
|
})))).await.unwrap().for_each(drop);
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 200);
|
|
|
|
bank_items.items[199].with_stacked(|items| {
|
|
|
|
assert_eq!(items.len(), 4);
|
|
|
@ -822,7 +828,7 @@ async fn test_deposit_meseta() { |
|
|
|
})))).await.unwrap().for_each(drop);
|
|
|
|
|
|
|
|
let c1_meseta = entity_gateway.get_character_meseta(&char1.id).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert!(c1_meseta.0 == 277);
|
|
|
|
assert!(c1_bank_meseta.0 == 23);
|
|
|
|
}
|
|
|
@ -833,7 +839,7 @@ async fn test_deposit_too_much_meseta() { |
|
|
|
|
|
|
|
let (_user1, char1) = new_user_character(&mut entity_gateway, "a1", "a", 1).await;
|
|
|
|
entity_gateway.set_character_meseta(&char1.id, item::Meseta(300)).await.unwrap();
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, item::BankName("".into()), item::Meseta(999980)).await.unwrap();
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, &item::BankName("".into()), item::Meseta(999980)).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -859,7 +865,7 @@ async fn test_deposit_too_much_meseta() { |
|
|
|
})))).await.unwrap().for_each(drop);
|
|
|
|
|
|
|
|
let c1_meseta = entity_gateway.get_character_meseta(&char1.id).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert!(c1_meseta.0 == 300);
|
|
|
|
assert!(c1_bank_meseta.0 == 999980);
|
|
|
|
}
|
|
|
@ -870,7 +876,7 @@ async fn test_deposit_meseta_when_bank_is_maxed() { |
|
|
|
|
|
|
|
let (_user1, char1) = new_user_character(&mut entity_gateway, "a1", "a", 1).await;
|
|
|
|
entity_gateway.set_character_meseta(&char1.id, item::Meseta(300)).await.unwrap();
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, item::BankName("".into()), item::Meseta(999999)).await.unwrap();
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, &item::BankName("".into()), item::Meseta(999999)).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -896,7 +902,7 @@ async fn test_deposit_meseta_when_bank_is_maxed() { |
|
|
|
})))).await.unwrap().for_each(drop);
|
|
|
|
|
|
|
|
let c1_meseta = entity_gateway.get_character_meseta(&char1.id).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert!(c1_meseta.0 == 300);
|
|
|
|
assert!(c1_bank_meseta.0 == 999999);
|
|
|
|
}
|
|
|
@ -924,7 +930,7 @@ async fn test_withdraw_individual_item() { |
|
|
|
),
|
|
|
|
}).await.unwrap());
|
|
|
|
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -984,7 +990,7 @@ async fn test_withdraw_stacked_item() { |
|
|
|
}).await.unwrap());
|
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![monomates]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![monomates]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -1043,7 +1049,7 @@ async fn test_withdraw_partial_stacked_item() { |
|
|
|
),
|
|
|
|
}).await.unwrap());
|
|
|
|
}
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![monomates]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![monomates]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -1073,10 +1079,10 @@ async fn test_withdraw_partial_stacked_item() { |
|
|
|
|
|
|
|
assert!(packets.len() == 2);
|
|
|
|
assert!(matches!(&packets[1], (ClientId(2), SendShipPacket::Message(Message {msg: GameMessage::CreateItem(create_item)}))
|
|
|
|
if create_item.item_id == 0x10002
|
|
|
|
if create_item.item_id == 0x20002
|
|
|
|
));
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 1);
|
|
|
|
bank_items.items[0].with_stacked(|items| {
|
|
|
|
assert_eq!(items.iter().map(|i| i.id).collect::<Vec<_>>(),
|
|
|
@ -1121,7 +1127,7 @@ async fn test_withdraw_stacked_item_with_stack_already_in_inventory() { |
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_inventory(&char1.id, &item::InventoryEntity::new(vec![inventory_monomates])).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_monomates]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_monomates]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -1154,7 +1160,7 @@ async fn test_withdraw_stacked_item_with_stack_already_in_inventory() { |
|
|
|
if create_item.item_id == 0x10000
|
|
|
|
));
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 0);
|
|
|
|
|
|
|
|
let inventory_items = entity_gateway.get_character_inventory(&char1.id).await.unwrap();
|
|
|
@ -1196,7 +1202,7 @@ async fn test_withdraw_stacked_item_with_full_stack_in_inventory() { |
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_inventory(&char1.id, &item::InventoryEntity::new(vec![inventory_monomates])).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_monomates]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_monomates]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -1223,7 +1229,7 @@ async fn test_withdraw_stacked_item_with_full_stack_in_inventory() { |
|
|
|
|
|
|
|
assert!(packets.is_err());
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 1);
|
|
|
|
bank_items.items[0].with_stacked(|items| {
|
|
|
|
assert_eq!(items.iter().map(|i| i.id).collect::<Vec<_>>(),
|
|
|
@ -1276,7 +1282,7 @@ async fn test_withdraw_individual_item_in_full_inventory() { |
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_inventory(&char1.id, &item::InventoryEntity::new(inventory)).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(bank), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -1302,7 +1308,7 @@ async fn test_withdraw_individual_item_in_full_inventory() { |
|
|
|
})))).await;
|
|
|
|
assert!(packets.is_err());
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 1);
|
|
|
|
|
|
|
|
let inventory_items = entity_gateway.get_character_inventory(&char1.id).await.unwrap();
|
|
|
@ -1345,7 +1351,7 @@ async fn test_withdraw_stacked_item_in_full_inventory() { |
|
|
|
}
|
|
|
|
|
|
|
|
entity_gateway.set_character_inventory(&char1.id, &item::InventoryEntity::new(inventory)).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![monomates]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![monomates]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -1373,7 +1379,7 @@ async fn test_withdraw_stacked_item_in_full_inventory() { |
|
|
|
assert!(packets.is_err());
|
|
|
|
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert_eq!(bank_items.items.len(), 1);
|
|
|
|
bank_items.items[0].with_stacked(|items| {
|
|
|
|
assert_eq!(items.iter().map(|i| i.id).collect::<Vec<_>>(),
|
|
|
@ -1401,7 +1407,7 @@ async fn test_withdraw_stacked_item_in_full_inventory_with_partial_stack() { |
|
|
|
),
|
|
|
|
}).await.unwrap());
|
|
|
|
}
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_item]), item::BankName("".into())).await.unwrap();
|
|
|
|
entity_gateway.set_character_bank(&char1.id, &item::BankEntity::new(vec![bank_item]), &item::BankName("".into())).await.unwrap();
|
|
|
|
|
|
|
|
let mut items = Vec::new();
|
|
|
|
for _i in 0..29usize {
|
|
|
@ -1458,7 +1464,7 @@ async fn test_withdraw_stacked_item_in_full_inventory_with_partial_stack() { |
|
|
|
unknown: 0,
|
|
|
|
})))).await.unwrap().for_each(drop);
|
|
|
|
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let bank_items = entity_gateway.get_character_bank(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert!(bank_items.items.len() == 0);
|
|
|
|
|
|
|
|
let inventory_items = entity_gateway.get_character_inventory(&char1.id).await.unwrap();
|
|
|
@ -1476,7 +1482,7 @@ async fn test_withdraw_meseta() { |
|
|
|
let mut entity_gateway = InMemoryGateway::default();
|
|
|
|
|
|
|
|
let (_user1, char1) = new_user_character(&mut entity_gateway, "a1", "a", 1).await;
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, item::BankName("".into()), item::Meseta(300)).await.unwrap();
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, &item::BankName("".into()), item::Meseta(300)).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -1502,7 +1508,7 @@ async fn test_withdraw_meseta() { |
|
|
|
})))).await.unwrap().for_each(drop);
|
|
|
|
|
|
|
|
let c1_meseta = entity_gateway.get_character_meseta(&char1.id).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert!(c1_meseta.0 == 23);
|
|
|
|
assert!(c1_bank_meseta.0 == 277);
|
|
|
|
}
|
|
|
@ -1513,7 +1519,7 @@ async fn test_withdraw_too_much_meseta() { |
|
|
|
|
|
|
|
let (_user1, char1) = new_user_character(&mut entity_gateway, "a1", "a", 1).await;
|
|
|
|
entity_gateway.set_character_meseta(&char1.id, item::Meseta(999980)).await.unwrap();
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, item::BankName("".into()), item::Meseta(300)).await.unwrap();
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, &item::BankName("".into()), item::Meseta(300)).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -1539,7 +1545,7 @@ async fn test_withdraw_too_much_meseta() { |
|
|
|
})))).await.unwrap().for_each(drop);
|
|
|
|
|
|
|
|
let c1_meseta = entity_gateway.get_character_meseta(&char1.id).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert!(c1_meseta.0 == 999980);
|
|
|
|
assert!(c1_bank_meseta.0 == 300);
|
|
|
|
}
|
|
|
@ -1550,7 +1556,7 @@ async fn test_withdraw_meseta_inventory_is_maxed() { |
|
|
|
|
|
|
|
let (_user1, char1) = new_user_character(&mut entity_gateway, "a1", "a", 1).await;
|
|
|
|
entity_gateway.set_character_meseta(&char1.id, item::Meseta(999999)).await.unwrap();
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, item::BankName("".into()), item::Meseta(300)).await.unwrap();
|
|
|
|
entity_gateway.set_bank_meseta(&char1.id, &item::BankName("".into()), item::Meseta(300)).await.unwrap();
|
|
|
|
|
|
|
|
let mut ship = Box::new(ShipServerState::builder()
|
|
|
|
.gateway(entity_gateway.clone())
|
|
|
@ -1576,7 +1582,7 @@ async fn test_withdraw_meseta_inventory_is_maxed() { |
|
|
|
})))).await.unwrap().for_each(drop);
|
|
|
|
|
|
|
|
let c1_meseta = entity_gateway.get_character_meseta(&char1.id).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, item::BankName("".into())).await.unwrap();
|
|
|
|
let c1_bank_meseta = entity_gateway.get_bank_meseta(&char1.id, &item::BankName("".into())).await.unwrap();
|
|
|
|
assert!(c1_meseta.0 == 999999);
|
|
|
|
assert!(c1_bank_meseta.0 == 300);
|
|
|
|
}
|