Implements 'transfer' method in clients

lib/rbtc_arbitrage/client.rb

@@ -32,6 +32,10 @@ def sell
       trade :sell
     end
 
+    def address
+      ENV["#{exchange.to_s.upcase}_ADDRESS"]
+    end
+
     private
 
     def set_key config, key, default

lib/rbtc_arbitrage/clients/bitstamp_client.rb

@@ -43,6 +43,10 @@ def trade action
         }
         Bitstamp.orders.send(action, bitstamp_options)
       end
+
+      def transfer other_client
+        Bitstamp.transfer(@options[:volume], other_client.address)
+      end
     end
   end
 end

lib/rbtc_arbitrage/clients/mtgox_client.rb

@@ -36,6 +36,10 @@ def trade action
         action = "#{action.to_s}!".to_sym
         MtGox.send(action, @options[:volume], :market)
       end
+
+      def transfer other_client
+        MtGox.withdraw! @options[:volume], other_client.address
+      end
     end
   end
 end

lib/rbtc_arbitrage/trader.rb

@@ -49,9 +49,6 @@ def execute_trade
           @buy_client.buy
           @sell_client.sell
           @buy_client.transfer @sell_client
-          # Bitstamp.orders.buy @options[:volume], buyer[:price] + 0.001
-          # MtGox.sell! @options[:volume], :market
-          # Bitstamp.transfer @options[:volume], ENV['MTGOX_ADDRESS']
         end
       else
         logger.info "Not trading live because cutoff is higher than profit." if @options[:verbose]
@@ -60,23 +57,8 @@ def execute_trade
 
     def fetch_prices
       logger.info "Fetching exchange rates" if @options[:verbose]
-      threads = [1,2].map do |n|
-        Thread.new do
-          if n == 1
-            Thread.current[:output] = @buy_client.price :buy
-          else
-            Thread.current[:output] = @sell_client.price :sell
-          end
-        end
-      end
-      threads.each_with_index do |thread, i|
-        thread.join
-        if i == 0
-          buyer[:price] = thread[:output]
-        else
-          seller[:price] = thread[:output]
-        end
-      end
+      buyer[:price] = @buy_client.price(:buy)
+      seller[:price] = @sell_client.price(:sell)
       prices = [buyer[:price], seller[:price]]
       @paid = prices.min * 1.005 * @options[:volume]
       @received = prices.max * 0.994 * @options[:volume]

spec/clients/bitstamp_client_spec.rb

@@ -42,4 +42,12 @@
       end
     end
   end
+
+  describe "#transfer" do
+    it "calls Bitstamp correctly" do
+      sell_client = RbtcArbitrage::Clients::MtGoxClient.new
+      Bitstamp.should_receive(:transfer).with(0.01, sell_client.address)
+      client.transfer sell_client
+    end
+  end
 end

spec/clients/mtgox_client_spec.rb

@@ -41,4 +41,12 @@
       client.trade(:buy)
     end
   end
+
+  describe "#transfer" do
+    it "calls MtGox correctly" do
+      sell_client = RbtcArbitrage::Clients::BitstampClient.new
+      MtGox.should_receive(:withdraw!).with(0.01, sell_client.address)
+      client.transfer sell_client
+    end
+  end
 end

spec/trader_spec.rb

@@ -45,17 +45,6 @@
     end
   end
 
-  # describe "#get_balance" do
-  #   it "fetches the right balance", :vcr do
-  #     trader.validate_env
-  #     balances = MtGox.balance
-  #     balance = RbtcArbitrage::Clients::MtGoxClient.new(:mtgox).balance
-  #     balance.should == [balances[0].amount.to_f, balances[1].amount.to_f]
-  #     balances = Bitstamp.balance
-  #     RbtcArbitrage::Client.new(:bitstamp).balance.should == [balances["usd_available"].to_f, balances["btc_available"].to_f]
-  #   end
-  # end
-
   describe "#initialize" do
     let(:options) {
       {