Remove properties from bitshares_engine.py and bitshares_feed.py

Since changing the _market -> market and _account to account was made
these properties conflicted with the variable names thus removed.

Author: joelvai

dexbot/orderengines/bitshares_engine.py

@@ -682,15 +682,6 @@ def retry_action(self, action, *args, **kwargs):
                 else:
                     raise
 
-    @property
-    def account(self):
-        """ Return the full account as :class:`bitshares.account.Account` object!
-            Can be refreshed by using ``x.refresh()``
-
-            :return: object | Account
-        """
-        return self.account
-
     @property
     def balances(self):
         """ Returns all the balances of the account assigned for the worker.
@@ -745,13 +736,6 @@ def own_orders(self):
         """
         return self.get_own_orders()
 
-    @property
-    def market(self):
-        # TODO: property, also in price feed, need to consider inheritance priority
-        """ Return the market object as :class:`bitshares.market.Market`
-        """
-        return self.market
-
     @staticmethod
     def get_updated_limit_order(limit_order):
         """ Returns a modified limit_order so that when passed to Order class,

dexbot/pricefeeds/bitshares_feed.py

@@ -335,12 +335,6 @@ def get_market_spread(self, quote_amount=0, base_amount=0):
 
         return ask / bid - 1
 
-    @property
-    def market(self):
-        """ Return the market object as :class:`bitshares.market.Market`
-        """
-        return self.market
-
     @staticmethod
     def sort_orders_by_price(orders, sort='DESC'):
         """ Return list of orders sorted ascending or descending by price