Merge pull request #147 from lbryio/revert-141-add_channel_weight

Revert "added channel effective amount to the claim weight."

server/controllers/lighthouse.js

@@ -63,21 +63,12 @@ function getResults (input) {
       },
     },
   };
-  const funcScoreClaimWeight = { // 100 LBC adds 1 point to the score
+  const funcScore = { // 100 LBC adds 1 point to the score
     'function_score': {
-      'field_value_factor': {
-        'field'  : 'effective_amount',
-        'factor' : effectiveFactor,
-        'missing': 1,
-      },
-    },
-  };
-  const funcScoreChannelWeight = { // 100 LBC adds 1 point to the score
-    'function_score': {
-      'field_value_factor': {
-        'field'  : 'certificate_amount',
-        'factor' : effectiveFactor,
-        'missing': 1,
+      'script_score': {
+        'script': {
+          'source': `${effectiveFactor} * doc['effective_amount'].value`,
+        },
       },
     },
   };
@@ -185,8 +176,7 @@ function getResults (input) {
         'bool': {
           'should': [
             conBoost,
-            funcScoreClaimWeight,
-            funcScoreChannelWeight,
+            funcScore,
           ],
           'must': [
             channelSearch,

server/utils/chainquery/index.js

@@ -172,7 +172,6 @@ function getClaimsSince (time, lastID, MaxClaimsInCall) {
       `p.name as channel,` +
       `c.bid_state,` +
       `c.effective_amount,` +
-      `COALESCE(p.effective_amount,0.0) as certificate_amount,` +
       `c.claim_id as claimId,` +
       `c.value_as_json as value ` +
       `FROM claim c ` +