Skip to content

Commit

Permalink
Changed mine_friendly to mine_charity
Browse files Browse the repository at this point in the history
  • Loading branch information
clr committed Aug 4, 2011
1 parent b24f1d1 commit b538fb0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class Pool():
def __init__(self,bitHopper):
self.servers = {}
self.api_pull = ['mine','info','mine_slush','mine_nmc','mine_friendly','backup','backup_latehop']
self.api_pull = ['mine','info','mine_slush','mine_nmc','mine_charity','backup','backup_latehop']

parser = ConfigParser.SafeConfigParser()
try:
Expand Down
8 changes: 4 additions & 4 deletions scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ def select_best_server(self,):
info = self.bh.pool.get_entry(server)
if info['api_lag'] or info['lag']:
continue
if info['role'] not in ['mine','mine_nmc','mine_slush','mine_friendly']:
if info['role'] not in ['mine','mine_nmc','mine_slush','mine_charity']:
continue
if info['role'] in ['mine', 'mine_friendly']:
if info['role'] in ['mine', 'mine_charity']:
shares = info['shares']
elif info['role'] == 'mine_slush':
shares = info['shares'] * 4
Expand All @@ -84,7 +84,7 @@ def select_friendly_server(self):
most_shares = self.bh.difficulty.get_difficulty() * 2
for server in self.bh.pool.get_servers():
info = self.bh.pool.get_entry(server)
if info['role'] != 'mine_friendly':
if info['role'] != 'mine_charity':
continue
if info['shares'] > most_shares and info['lag'] == False:
server_name = server
Expand Down Expand Up @@ -174,7 +174,7 @@ def server_update(self,):
return True

current_role = current_pool['role']
if current_role == 'mine' or current_role == 'mine_friendly':
if current_role == 'mine' or current_role == 'mine_charity':
difficulty = self.bh.difficulty.get_difficulty()
if current_role == 'mine_nmc':
difficulty = self.bh.difficulty.get_nmc_difficulty()
Expand Down
2 changes: 1 addition & 1 deletion user.cfg.default
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# backup = hopps on this when no Prop. pool is available
# backup_latehop = prefers this for backup if pool has
# high share count, recommended for all PPS backups
# mine_friendly = usually mines the pool when they hit
# mine_charity = usually mines the pool when they hit
# and increased diff block (bad luck) + normal mining
# info = shows share count for this pool on stat page
# disable = disables pool completely (you can delete
Expand Down

0 comments on commit b538fb0

Please sign in to comment.