acpc_poker_types 6.2.3 → 7.0.0

data/lib/acpc_poker_types/player.rb

@@ -0,0 +1,50 @@
+require 'delegate'
+
+require 'acpc_poker_types/chip_stack'
+require 'acpc_poker_types/hand_player'
+require 'acpc_poker_types/hand'
+
+module AcpcPokerTypes
+
+class NilHandPlayer < HandPlayer
+  def initialize()
+    @hand = Hand.new
+    @initial_stack = 0
+    @ante = 0
+    @winnings = ChipStack.new 0
+    @actions = [[]]
+  end
+  def stack() 0 end
+  def contributions() [] end
+  def total_contribution() 0 end
+  def legal_actions(
+    round: 0,
+    amount_to_call: ChipStack.new(0),
+    wager_illegal: false
+  ) [] end
+  def inactive?() false end
+  def all_in?() false end
+  def folded?() false end
+end
+
+class Player < DelegateClass(HandPlayer)
+  attr_reader :seat, :hand_player
+  attr_accessor :balance
+
+  def initialize(seat)
+    @seat = seat
+    @balance = 0
+    @hand_player = NilHandPlayer.new
+
+    super @hand_player
+  end
+
+  def hand_player=(new_hand_player)
+    @hand_player = new_hand_player
+
+    __setobj__ @hand_player
+
+    @hand_player
+  end
+end
+end

data/lib/acpc_poker_types/players_at_the_table.rb

@@ -0,0 +1,168 @@
+require 'acpc_poker_types/seat'
+require 'acpc_poker_types/poker_action'
+require 'acpc_poker_types/player'
+
+require 'contextual_exceptions'
+using ContextualExceptions::ClassRefinement
+
+module AcpcPokerTypes
+module MapWithIndex
+  refine Array do
+    def map_with_index
+      i = 0
+      map do |elem|
+        result = yield elem, i
+        i += 1
+        result
+      end
+    end
+  end
+end
+end
+using AcpcPokerTypes::MapWithIndex
+
+
+module AcpcPokerTypes
+
+class PlayersAtTheTable
+  exceptions :player_acted_before_sitting_at_table,
+    :no_players_to_seat, :multiple_players_have_the_same_seat
+
+  attr_reader :players, :match_state, :game_def
+
+  class << self; alias_method(:seat_players, :new) end
+
+  # @param [GameDefinition] game_def The game definition for the
+  #  match these players are playing
+  # @param [#to_i] seat The user's seat. Defaults to zero.
+  def initialize(game_def, seat = 0)
+    @players = game_def.number_of_players.times.map do |i|
+      Player.new(
+        Seat.new(i, game_def.number_of_players)
+      )
+    end
+    @game_def = game_def
+    @seat = Seat.new(seat, game_def.number_of_players)
+  end
+
+  # @param [MatchState] match_state The next match state.
+  def update!(match_state)
+    @match_state = match_state
+
+    update_players!
+  end
+
+  # @return [Boolean] +true+ if the hand has ended, +false+ otherwise.
+  def hand_ended?
+    return false unless @match_state
+
+    @match_state.hand_ended? @game_def
+  end
+
+  # @return [Player] The player with the dealer button.
+  def dealer_player
+    return Player.new(nil) unless @match_state
+    @players.find { |player| position_relative_to_dealer(player) == @players.length - 1}
+  end
+  def big_blind_payer
+    @players.find do |plyr|
+      position_relative_to_dealer(plyr) == @game_def.blinds.index(@game_def.blinds.max)
+    end
+  end
+  def small_blind_payer
+    @players.find do |plyr|
+      position_relative_to_dealer(plyr) == (
+        @game_def.blinds.index do |blind|
+          blind < @game_def.blinds.max && blind > 0
+        end
+      )
+    end
+  end
+  def next_player_to_act
+    return Player.new(nil) if @match_state.nil? || hand_ended?
+
+    @players.find { |plyr| position_relative_to_dealer(plyr) == @match_state.next_to_act(@game_def) }
+  end
+
+  # @return [Boolean] +true+ if it is the user's turn to act, +false+ otherwise.
+  def users_turn_to_act?
+    return false if @match_state.nil? || hand_ended?
+
+    next_player_to_act.seat == seat
+  end
+
+  # @param [Integer] player The player of which the position relative to the
+  #  dealer is desired.
+  # @return [Integer] The position relative to the dealer of the given player,
+  #  +player+, indexed such that the player immediately to to the left of the
+  #  dealer has a +position_relative_to_dealer+ of zero.
+  # @raise (see Integer#seat_from_relative_position)
+  # @raise (see Integer#position_relative_to)
+  def position_relative_to_dealer(player)
+    (seat.seats_to(player) + users_position_relative_to_dealer) % @players.length
+  end
+
+  # @return [Array] The set of legal actions for the currently acting player.
+  def legal_actions
+    return [] unless @match_state
+
+    @match_state.players(@game_def)[users_position_relative_to_dealer].legal_actions
+  end
+
+  # @return [String] player acting sequence as a string.
+  def player_acting_sequence_string
+    (player_acting_sequence.map { |per_round| per_round.join('') }).join('/')
+  end
+
+  # @return [Array<Array<Integer>>] The sequence of seats that acted,
+  #  separated by round.
+  def player_acting_sequence
+    return [[]] unless @match_state
+
+    @match_state.player_acting_sequence(@game_def).map do |actions_per_round|
+      next [] if actions_per_round.empty?
+
+      actions_per_round.map do |pos_rel_dealer|
+        seat(pos_rel_dealer)
+      end
+    end
+  end
+
+  def seat(pos_rel_dealer = users_position_relative_to_dealer)
+    return @seat if pos_rel_dealer == users_position_relative_to_dealer
+
+    Seat.new(
+      @seat + Seat.new(users_position_relative_to_dealer, @game_def.number_of_players).seats_to(pos_rel_dealer),
+      @game_def.number_of_players
+    )
+  end
+
+  def users_position_relative_to_dealer
+    @match_state.position_relative_to_dealer
+  end
+
+  private
+
+  def update_players!
+    return self if @match_state.first_state_of_first_round?
+
+    @players.each do |plyr|
+      plyr.hand_player = @match_state.players(@game_def)[position_relative_to_dealer(plyr)]
+    end
+
+    distribute_chips! if hand_ended?
+
+    self
+  end
+
+  # Distribute chips to all winning players
+  # @param [BoardCards] board_cards The community board cards.
+  def distribute_chips!
+    @players.each do |plyr|
+      plyr.balance += plyr.hand_player.balance
+    end
+
+    self
+  end
+end
+end

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '6.2.3'
+  VERSION = '7.0.0'
 end

data/spec/{action_messages_spec.rb → dealer_data/action_messages_spec.rb}

@@ -1,6 +1,5 @@
-
 # Spec helper (must include first to track code coverage with SimpleCov)
-require_relative 'support/spec_helper'
+require_relative '../support/spec_helper'
 
 require 'mocha/setup'
 
@@ -8,11 +7,11 @@ require 'acpc_dealer'
 require 'acpc_poker_types/match_state'
 require 'acpc_poker_types/poker_action'
 
-require 'acpc_poker_types/acpc_dealer_data/action_messages'
-require 'acpc_poker_types/acpc_dealer_data/match_definition'
-require 'acpc_poker_types/acpc_dealer_data/log_file'
+require 'acpc_poker_types/dealer_data/action_messages'
+require 'acpc_poker_types/dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/log_file'
 
-describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
+describe AcpcPokerTypes::DealerData::ActionMessages do
   before do
     @data = nil
     @final_score = nil
@@ -26,33 +25,33 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
     it 'properly parses a ACPC log "TO . . ." line' do
       [
         "TO 1 at 1341695999.222281 MATCHSTATE:0:0::5d5c|\n" =>
-          AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+          AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
             0,
             AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:0::5d5c|')
           ),
         "TO 2 at 1341695920.914907 MATCHSTATE:1:0:r19686:|9hQd\n" =>
-          AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+          AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
             1,
             AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:0:r19686:|9hQd')
           ),
         "TO 3 at 1341696044.566738 MATCHSTATE:2:0:rf:||8dAs\n" =>
-          AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+          AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
             2,
             AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:0:rf:||8dAs')
           ),
         "TO 1 at 1341715418.808925 MATCHSTATE:0:0:fcr17162:5d5c||\n" =>
-          AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+          AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
             0,
             AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:0:fcr17162:5d5c||')
           )
       ].each do |to_message_to_data|
         to_message_to_data.each do |to_message, expected_values|
-          AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_to_message(to_message).must_equal expected_values
+          AcpcPokerTypes::DealerData::ActionMessages.parse_to_message(to_message).must_equal expected_values
         end
       end
     end
     it 'returns nil if asked to parse an improperly formatted string' do
-      AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_to_message("improperly formatted string").must_be_nil
+      AcpcPokerTypes::DealerData::ActionMessages.parse_to_message("improperly formatted string").must_be_nil
     end
   end
 
@@ -60,37 +59,37 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
     it 'properly parses a ACPC log "FROM . . ." line' do
       [
         "FROM 2 at 1341695999.222410 MATCHSTATE:1:0::|9hQd:c\n" =>
-          AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+          AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
             1,
             AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:0::|9hQd'),
             AcpcPokerTypes::PokerAction.new('c')
           ),
         "FROM 1 at 1341695920.914935 MATCHSTATE:0:0:r19686:5d5c|:r20000\n" =>
-          AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+          AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
             0,
             AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:0:r19686:5d5c|'),
             AcpcPokerTypes::PokerAction.new('r20000')
           ),
         "FROM 3 at 1341696044.566938 MATCHSTATE:2:0:rfr:||8dAs:r\n" =>
-          AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+          AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
             2,
             AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:0:rfr:||8dAs'),
             AcpcPokerTypes::PokerAction.new('r')
           ),
         "FROM 2 at 1341715418.808896 MATCHSTATE:1:0:fc:|9hQd|:r17162\n" =>
-          AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+          AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
             1,
             AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:0:fc:|9hQd|'),
             AcpcPokerTypes::PokerAction.new('r17162')
           )
       ].each do |from_message_to_data|
         from_message_to_data.each do |from_message, expected_values|
-          AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_from_message(from_message).must_equal expected_values
+          AcpcPokerTypes::DealerData::ActionMessages.parse_from_message(from_message).must_equal expected_values
         end
       end
     end
     it 'returns nil if asked to parse an improperly formatted string' do
-      AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_from_message("improperly formatted string").must_be_nil
+      AcpcPokerTypes::DealerData::ActionMessages.parse_from_message("improperly formatted string").must_be_nil
     end
   end
 
@@ -101,12 +100,12 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
         'SCORE:19835|621.5|-20455.5:p1|p2|p3' => {p1: 19835, p2: 621.5, p3: -20455.5}
       ].each do |score_to_player_results|
         score_to_player_results.each do |score_string, expected_values|
-          AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_score(score_string).must_equal expected_values
+          AcpcPokerTypes::DealerData::ActionMessages.parse_score(score_string).must_equal expected_values
         end
       end
     end
     it 'returns nil if asked to parse an improperly formatted string' do
-      AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_score("improperly formatted string").must_be_nil
+      AcpcPokerTypes::DealerData::ActionMessages.parse_score("improperly formatted string").must_be_nil
     end
   end
 
@@ -115,17 +114,17 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
       it 'when every hand is desired' do
         init_data do |action_messages|
           file_name = 'file_name'
-          AcpcPokerTypes::AcpcDealerData::LogFile.expects(:open).with(file_name, 'r').yields(
+          AcpcPokerTypes::DealerData::LogFile.expects(:open).with(file_name, 'r').yields(
             action_messages
           ).returns(
-            AcpcPokerTypes::AcpcDealerData::ActionMessages.parse(
+            AcpcPokerTypes::DealerData::ActionMessages.parse(
               action_messages,
               @player_names,
               AcpcDealer::DEALER_DIRECTORY
             )
           )
 
-          @patient = AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_file(
+          @patient = AcpcPokerTypes::DealerData::ActionMessages.parse_file(
             file_name,
             @player_names,
             AcpcDealer::DEALER_DIRECTORY
@@ -139,10 +138,10 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
         num_hands = 1
         init_data do |action_messages|
           file_name = 'file_name'
-          AcpcPokerTypes::AcpcDealerData::LogFile.expects(:open).with(file_name, 'r').yields(
+          AcpcPokerTypes::DealerData::LogFile.expects(:open).with(file_name, 'r').yields(
             action_messages
           ).returns(
-            AcpcPokerTypes::AcpcDealerData::ActionMessages.parse(
+            AcpcPokerTypes::DealerData::ActionMessages.parse(
               action_messages,
               @player_names,
               AcpcDealer::DEALER_DIRECTORY,
@@ -150,7 +149,7 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
             )
           )
 
-          @patient = AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_file(
+          @patient = AcpcPokerTypes::DealerData::ActionMessages.parse_file(
             file_name,
             @player_names,
             AcpcDealer::DEALER_DIRECTORY,
@@ -168,7 +167,7 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
     describe 'from array' do
       it 'when all hands are desired' do
         init_data do |action_messages|
-          @patient = AcpcPokerTypes::AcpcDealerData::ActionMessages.parse(
+          @patient = AcpcPokerTypes::DealerData::ActionMessages.parse(
             action_messages,
             @player_names,
             AcpcDealer::DEALER_DIRECTORY
@@ -181,7 +180,7 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
         @no_final_score = true
         num_hands = 1
         init_data do |log_statements|
-          @patient = AcpcPokerTypes::AcpcDealerData::ActionMessages.parse(
+          @patient = AcpcPokerTypes::DealerData::ActionMessages.parse(
             log_statements,
             @player_names,
             AcpcDealer::DEALER_DIRECTORY,
@@ -209,7 +208,7 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
       @final_score = data_hash[:final_score]
       @data = data_hash[:data]
       @player_names = data_hash[:player_names]
-      @match_def = AcpcPokerTypes::AcpcDealerData::MatchDefinition.parse(
+      @match_def = AcpcPokerTypes::DealerData::MatchDefinition.parse(
         data_hash[:action_messages].first,
         @player_names,
         AcpcDealer::DEALER_DIRECTORY
@@ -237,39 +236,39 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
         ],
         data: [
           [
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:998:crc/cc/cc/:|TdQd/As6d6h/7h/4s')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:998:crc/cc/cc/:Jc8d|/As6d6h/7h/4s')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:998:crc/cc/cc/:Jc8d|/As6d6h/7h/4s'),
               AcpcPokerTypes::PokerAction.new('r')
             )
           ],
           [
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:crc/cc/cc/r:|TdQd/As6d6h/7h/4s')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:crc/cc/cc/r:Jc8d|/As6d6h/7h/4s')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:crc/cc/cc/r:|TdQd/As6d6h/7h/4s'),
               AcpcPokerTypes::PokerAction.new('c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:crc/cc/cc/rc:Jc8d|TdQd/As6d6h/7h/4s')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:crc/cc/cc/rc:Jc8d|TdQd/As6d6h/7h/4s')
             )
@@ -296,47 +295,47 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
         ],
         data: [
           [
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:998:cc/r5841r19996r20000:Kc6h|/QhAh8d')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:998:cc/r5841r19996r20000:|Qc3s/QhAh8d')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:998:cc/r5841r19996r20000:|Qc3s/QhAh8d:c'),
               AcpcPokerTypes::PokerAction.new('c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:998:cc/r5841r19996r20000c//:Kc6h|Qc3s/QhAh8d/Th/9d')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:998:cc/r5841r19996r20000c//:Kc6h|Qc3s/QhAh8d/Th/9d')
             )
           ],
           [
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999::|TdQd')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999::Jc8d|')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999::|TdQd'),
               AcpcPokerTypes::PokerAction.new('f')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:f:|TdQd')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:f:Jc8d|')
             )
@@ -360,32 +359,32 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
         ],
         data: [
           [
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:ccc/ccc/rrcc/rrrfr:QsAs||/4d6d2d/5d/2c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:ccc/ccc/rrcc/rrrfr:|3s8h|/4d6d2d/5d/2c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               2,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:999:ccc/ccc/rrcc/rrrfr:||Qd3c/4d6d2d/5d/2c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               2,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:999:ccc/ccc/rrcc/rrrfr:||Qd3c/4d6d2d/5d/2c'),
               AcpcPokerTypes::PokerAction.new('c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:ccc/ccc/rrcc/rrrfrc:QsAs|3s8h|Qd3c/4d6d2d/5d/2c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:ccc/ccc/rrcc/rrrfrc:|3s8h|Qd3c/4d6d2d/5d/2c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               2,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:999:ccc/ccc/rrcc/rrrfrc:|3s8h|Qd3c/4d6d2d/5d/2c')
             )
@@ -409,34 +408,34 @@ describe AcpcPokerTypes::AcpcDealerData::ActionMessages do
         ],
         data: [
           [
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:998:ccr12926r20000c:QsAs||')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:998:ccr12926r20000c:|3s8h|')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               2,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:998:ccr12926r20000c:||Qd3c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:998:ccr12926r20000c:|3s8h|'),
               AcpcPokerTypes::PokerAction.new('c')
             )
           ],
           [
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:ccr12926r20000cc///:QsAs|3s8h|Qd3c/4d6d2d/5d/2c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:ccr12926r20000cc///:QsAs|3s8h|Qd3c/4d6d2d/5d/2c')
             ),
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::ToMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::ToMessage.new(
               2,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:999:ccr12926r20000cc///:QsAs|3s8h|Qd3c/4d6d2d/5d/2c')
             )