From 9b3618f73ee796b73ec76a380d485bf5fd502558 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Tue, 13 Sep 2022 13:02:39 -0400
Subject: [PATCH] feedback

---
 hub/db/db.py          | 10 +++++-----
 hub/db/prefixes.py    |  4 ++--
 hub/scribe/service.py |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hub/db/db.py b/hub/db/db.py
index d78ee1e..36b8da5 100644
--- a/hub/db/db.py
+++ b/hub/db/db.py
@@ -499,9 +499,9 @@ class SecondaryDB:
             if not v:
                 amount = 0
             elif txo_type is ACTIVATED_SUPPORT_TXO_TYPE:
-                amount = v.support_sum
+                amount = v.activated_support_sum
             else:
-                amount = v.effective_amount - v.support_sum
+                amount = v.activated_sum - v.activated_support_sum
             if height == self.db_height + 1:
                 return amount
             return amount + sum(
@@ -521,7 +521,7 @@ class SecondaryDB:
             v = self.prefix_db.effective_amount.get(claim_hash)
             if not v:
                 return 0
-            return v.effective_amount - v.support_sum
+            return v.activated_sum - v.activated_support_sum
         for v in self.prefix_db.active_amount.iterate(
                 start=(claim_hash, ACTIVATED_CLAIM_TXO_TYPE, 0), stop=(claim_hash, ACTIVATED_CLAIM_TXO_TYPE, height),
                 include_key=False, reverse=True):
@@ -531,7 +531,7 @@ class SecondaryDB:
     def get_effective_amount(self, claim_hash: bytes) -> int:
         v = self.prefix_db.effective_amount.get(claim_hash)
         if v:
-            return v.effective_amount
+            return v.activated_sum
         return 0
 
     def get_url_effective_amount(self, name: str, claim_hash: bytes) -> Optional['BidOrderKey']:
@@ -665,7 +665,7 @@ class SecondaryDB:
 
         # collect all of the effective amounts
         effective_amounts = {
-            claim_hash: 0 if not v else v.effective_amount
+            claim_hash: 0 if not v else v.activated_sum
             async for (claim_hash, ), v in self.prefix_db.effective_amount.multi_get_async_gen(
                 self._executor, [(claim_hash,) for claim_hash in claims]
             )
diff --git a/hub/db/prefixes.py b/hub/db/prefixes.py
index 0e2b67f..d854f06 100644
--- a/hub/db/prefixes.py
+++ b/hub/db/prefixes.py
@@ -1775,8 +1775,8 @@ class EffectiveAmountKey(NamedTuple):
 
 
 class EffectiveAmountValue(NamedTuple):
-    effective_amount: int
-    support_sum: int
+    activated_sum: int
+    activated_support_sum: int
 
 
 class EffectiveAmountPrefixRow(PrefixRow):
diff --git a/hub/scribe/service.py b/hub/scribe/service.py
index 6698c3a..423d187 100644
--- a/hub/scribe/service.py
+++ b/hub/scribe/service.py
@@ -1305,15 +1305,15 @@ class BlockchainProcessorService(BlockchainService):
             )
         }
         current_effective_amounts = {
-            claim_hash: 0 if not v else v.effective_amount
+            claim_hash: 0 if not v else v.activated_sum
             for claim_hash, v in current_effective_amount_values.items()
         }
         current_supports_amount = {
-            claim_hash: 0 if not v else v.support_sum
+            claim_hash: 0 if not v else v.activated_support_sum
             for claim_hash, v in current_effective_amount_values.items()
         }
         delete_effective_amounts = [
-            self.db.prefix_db.effective_amount.pack_item(claim_hash, v.effective_amount, v.support_sum)
+            self.db.prefix_db.effective_amount.pack_item(claim_hash, v.activated_sum, v.activated_support_sum)
             for claim_hash, v in current_effective_amount_values.items() if v is not None
         ]
         claims = set(self.effective_amount_delta.keys()).union(self.active_support_amount_delta.keys())