diff --git a/src/cutecoin/core/account.py b/src/cutecoin/core/account.py index a8bccbb2ed45a16d623ea3a7a87ede61f35583af..55ec26984a4f315ce74346dd408731419afc7a29 100644 --- a/src/cutecoin/core/account.py +++ b/src/cutecoin/core/account.py @@ -26,7 +26,7 @@ def quantitative(units, community): def relative(units, community): - ud = community.dividend() + ud = community.dividend relative_value = units / float(ud) return relative_value @@ -38,7 +38,7 @@ def quantitative_zerosum(units, community): def relative_zerosum(units, community): median = community.monetary_mass / community.nb_members - ud = community.dividend() + ud = community.dividend relative_value = units / float(ud) relative_median = median / ud return relative_value - relative_median diff --git a/src/cutecoin/core/community.py b/src/cutecoin/core/community.py index e4e5b368410b995351004e2752d34c4e22a78e0c..9f1101b417f73fb7f89867fc7c198ea7ed5384a8 100644 --- a/src/cutecoin/core/community.py +++ b/src/cutecoin/core/community.py @@ -140,14 +140,15 @@ class Community(object): u = ord('\u24B6') + ord(letter) - ord('A') return chr(u) + @property def dividend(self): - block = self.get_ud_block() + block = self._ud_block() if block: return block['dividend'] else: return 1 - def get_ud_block(self): + def _ud_block(self): ud = self.request(bma.blockchain.UD) if len(ud['result']['blocks']) > 0: block_number = ud['result']['blocks'][-1] diff --git a/src/cutecoin/core/wallet.py b/src/cutecoin/core/wallet.py index 4a291d2f46b2669e58ca120a939852a9e776dab2..8c089e86c22ab2c76df46c0eb0d6e8a826786394 100644 --- a/src/cutecoin/core/wallet.py +++ b/src/cutecoin/core/wallet.py @@ -199,7 +199,7 @@ class Wallet(object): def relative_value(self, community): value = self.value(community) - ud = community.dividend() + ud = community.dividend relative_value = value / float(ud) return relative_value diff --git a/src/cutecoin/gui/transfer.py b/src/cutecoin/gui/transfer.py index da15100900e9d0dc1449829e1f39f52d59313f1f..e6eb917dd7261016cd4d2b57de0d1578a770dcfe 100644 --- a/src/cutecoin/gui/transfer.py +++ b/src/cutecoin/gui/transfer.py @@ -29,7 +29,7 @@ class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog): self.wallet = None self.community = self.sender.communities[0] self.wallet = self.sender.wallets[0] - self.dividend = self.community.dividend() + self.dividend = self.community.dividend for community in self.sender.communities: self.combo_community.addItem(community.currency) @@ -103,7 +103,7 @@ Please try again later""") def change_current_community(self, index): self.community = self.sender.communities[index] - self.dividend = self.community.dividend() + self.dividend = self.community.dividend amount = self.wallet.value(self.community) ref_amount = self.sender.units_to_ref(amount, self.community) ref_name = self.sender.ref_name(self.community.currency)