Skip to content

Commit 529dbcb

Browse files
author
DogLooksGood
committed
Fix version comparision in internal_get_game_state_and_players_reg_state
1 parent c4f060b commit 529dbcb

1 file changed

Lines changed: 2 additions & 11 deletions

File tree

transport/src/solana.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,6 @@ impl TransportT for SolanaTransport {
648648
.internal_get_game_state_and_players_reg_state(
649649
&game_account_pubkey,
650650
&game_state.players_reg_account,
651-
game_state.access_version,
652-
game_state.settle_version,
653651
)
654652
.await?;
655653
let players = players_reg.players;
@@ -806,8 +804,6 @@ impl TransportT for SolanaTransport {
806804
.internal_get_game_state_and_players_reg_state(
807805
&game_account_pubkey,
808806
&game_state.players_reg_account,
809-
game_state.access_version,
810-
game_state.settle_version,
811807
)
812808
.await?;
813809

@@ -1310,8 +1306,6 @@ impl TransportT for SolanaTransport {
13101306
let (game_state, players_reg) = match self.internal_get_game_state_and_players_reg_state(
13111307
&game_account_pubkey,
13121308
&state.players_reg_account,
1313-
state.access_version,
1314-
state.settle_version,
13151309
).await {
13161310
Ok((game_state, players_reg)) => (game_state, players_reg),
13171311
Err(e) => {
@@ -1343,8 +1337,6 @@ impl TransportT for SolanaTransport {
13431337
let (game_state, players_reg) = self.internal_get_game_state_and_players_reg_state(
13441338
&game_account_pubkey,
13451339
&game_state.players_reg_account,
1346-
game_state.access_version,
1347-
game_state.settle_version
13481340
).await?;
13491341
let players = players_reg.players;
13501342
Ok(Some(game_state.into_account(addr, players)?))
@@ -1694,8 +1686,6 @@ impl SolanaTransport {
16941686
&self,
16951687
game_account_pubkey: &Pubkey,
16961688
players_reg_account_pubkey: &Pubkey,
1697-
access_version: u64,
1698-
settle_version: u64,
16991689
) -> TransportResult<(GameState, PlayersReg)> {
17001690

17011691
let accounts_result = self.client.get_multiple_accounts_with_commitment(&[
@@ -1721,7 +1711,8 @@ impl SolanaTransport {
17211711
let mut players_reg = PlayersReg::try_from_slice(&players_reg_data.as_slice())
17221712
.map_err(|_| TransportError::PlayersRegDeserializationError)?;
17231713

1724-
if players_reg.access_version == access_version && players_reg.settle_version == settle_version {
1714+
if players_reg.access_version == game_state.access_version
1715+
&& players_reg.settle_version == game_state.settle_version {
17251716
players_reg.players.retain(|p| p.access_version != 0);
17261717

17271718
return Ok((game_state, players_reg));

0 commit comments

Comments
 (0)