Revert "Revert "Fix #733: Deprecate Challenge DF" (#781)" (#782)

* Revert "Revert "Fix #733: Deprecate Challenge DF" (#781)" This reverts commit 5ea85a7. * Update dispense_volume.yml --------- Co-authored-by: trizin <[email protected]>
oceanprotocol · Dec 11, 2023 · b55f97d · b55f97d
1 parent e391081
commit b55f97d
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 1,591 deletions.
diff --git a/.github/workflows/dispense_volume.yml b/.github/workflows/dispense_volume.yml
@@ -2,7 +2,7 @@ name: Dispense Active Rewards
 
 on:
   schedule:
-    - cron: "2 1 * * 4"
+    - cron: "0 0 * * 4"
   push:
     branches: [main]
   pull_request:
@@ -112,15 +112,6 @@ jobs:
           cp $CSV_DIR/rate-OCEAN.csv $CSV_DIR/rate-MOCEAN.csv
           sed -i -e 's/MOCEAN/OCEAN/g' $CSV_DIR/rate-MOCEAN.csv
 
-      - name: Challenge DF data
-        run: |
-          ./dftool challenge_data $CSV_DIR --RETRIES 3
-        env:
-          JUDGE_PRIVATE_KEY: ${{secrets.JUDGE_PRIVATE_KEY}}
-      - name: Run dftool calc rewards for DF Challenge
-        run: |
-          ./dftool calc challenge $CSV_DIR 0 --START_DATE $date
-
       - name: Run dftool calc rewards for volume
         run: |
           ./dftool calc volume $CSV_DIR 0 --START_DATE $date

diff --git a/.github/workflows/test-dfsql.yml b/.github/workflows/test-dfsql.yml
@@ -99,10 +99,6 @@ jobs:
         run: |
           ./dftool calc volume $CSV_DIR 100000000 --START_DATE $TEST_START_DATE
 
-      - name: Run dftool challenge calc
-        run: |
-          ./dftool dummy_csvs challenge $CSV_DIR
-
       - name: Move csvs to df-sql dir
         run: |
           mv /tmp/csv/* ~/.dfcsv
@@ -122,5 +118,3 @@ jobs:
           curl -X POST http://localhost:6234/allocations | grep -q "\"ocean_amt\":"
           curl -X POST http://localhost:6234/rewards | grep -q "\"LP_addr\":\"0x"
           curl -X POST http://localhost:6234/rewardsSummary | grep -q "\"curating_amt\":"
-          curl -X POST http://localhost:6234/challenge/data | grep -q "\"nmse\":0.4199999869"
-          curl -X POST http://localhost:6234/challenge/rewards | grep -q "\"winner_addr\":\"0xfrom2\""
diff --git a/df_py/challenge/__init__.py b/df_py/challenge/__init__.py
diff --git a/df_py/challenge/calc_rewards.py b/df_py/challenge/calc_rewards.py
diff --git a/df_py/challenge/csvs.py b/df_py/challenge/csvs.py