Minor test/style cleanup

Author: jhart-r7

lib/rex/proto/steam/message.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-
 module Rex
 module Proto
 ##
@@ -9,7 +8,6 @@ module Proto
 #
 ##
 module Steam
-
   FRAGMENTED_HEADER = 0xFFFFFFFE
   UNFRAGMENTED_HEADER = 0xFFFFFFFF
 
@@ -47,7 +45,7 @@ def a2s_info_decode(message)
     info = {}
     info[:version], info[:name], info[:map], info[:folder], info[:game_name],
       info[:game_id], players, players_max, info[:bots],
-      type, env, vis, vac, info[:game_version], edf = payload.unpack("CZ*Z*Z*Z*SCCCCCCCZ*C")
+      type, env, vis, vac, info[:game_version], _edf = payload.unpack("CZ*Z*Z*Z*SCCCCCCCZ*C")
 
     # translate type
     case type

spec/lib/rex/proto/steam/message_spec.rb

@@ -35,9 +35,13 @@
 
   describe '#a2s_info_decode' do
     it 'should extract a2s_info fields properly' do
-      example_resp = "\xff\xff\xff\xff\x49\x11\x2d\x3d\x54\x48\x45\x20\x42\x41\x54\x54\x4c\x45\x47\x52\x4f\x55\x4e\x44\x53\x20\x2a\x48\x41\x52\x44\x43\x4f\x52\x45\x2a\x3d\x2d\x00\x61\x6f\x63\x5f\x62\x61\x74\x74\x6c\x65\x67\x72\x6f\x75\x6e\x64\x00\x61\x67\x65\x6f\x66\x63\x68\x69\x76\x61\x6c\x72\x79\x00\x41\x67\x65\x20\x6f\x66\x20\x43\x68\x69\x76\x61\x6c\x72\x79\x00\x66\x44\x16\x20\x00\x64\x6c\x00\x01\x31\x2e\x30\x2e\x30\x2e\x36\x00\xb1\x87\x69\x04\x04\x7c\x35\xbe\x12\x40\x01\x48\x4c\x73\x74\x61\x74\x73\x58\x3a\x43\x45\x2c\x69\x6e\x63\x72\x65\x61\x73\x65\x64\x5f\x6d\x61\x78\x70\x6c\x61\x79\x65\x72\x73\x00\x66\x44\x00\x00\x00\x00\x00\x00"
-      expected_info = {:version=>17, :name=>"-=THE BATTLEGROUNDS *HARDCORE*=-", :map=>"aoc_battleground", :folder=>"ageofchivalry", :game_name=>"Age of Chivalry", :game_id=>17510, :players=>"22/32", :bots=>0, :game_version=>"1.0.0.6", :type=>"Dedicated", :environment=>"Linux", :visibility=>"public", :VAC=>"secured"}
-      actual_info = subject.a2s_info_decode(example_resp)
+      expected_info = {
+        version: 17, name: "-=THE BATTLEGROUNDS *HARDCORE*=-", map: "aoc_battleground",
+        folder: "ageofchivalry", game_name: "Age of Chivalry", game_id: 17510,
+        players: "22/32", bots: 0, game_version: "1.0.0.6", type: "Dedicated",
+        environment: "Linux", visibility: "public", VAC: "secured"
+      }
+      actual_info = subject.a2s_info_decode(IO.read(File.join(File.dirname(__FILE__), 'steam_info.bin')))
       expect(actual_info).to eq(expected_info)
     end
   end