From 9a9b14ba7a665edf1e39f94fb2a62d061ac5aa3f Mon Sep 17 00:00:00 2001
From: Matt Romano <42412983+mattromano@users.noreply.github.com>
Date: Tue, 2 Apr 2024 08:01:41 -0700
Subject: [PATCH] AN-4680/comp-and-comp-fork-liq-fix  (#266)

* fix comp fork models

* doc fix

* doc fix
---
 .../lending/defi__ez_lending_liquidations.yml |  6 ++---
 .../silver__complete_lending_liquidations.sql | 24 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/models/gold/defi/lending/defi__ez_lending_liquidations.yml b/models/gold/defi/lending/defi__ez_lending_liquidations.yml
index 916869be..7c8bb415 100644
--- a/models/gold/defi/lending/defi__ez_lending_liquidations.yml
+++ b/models/gold/defi/lending/defi__ez_lending_liquidations.yml
@@ -34,11 +34,11 @@ models:
         description: '{{ doc("complete_lending_collateral_asset") }}'
       - name: COLLATERAL_TOKEN_SYMBOL
         description: '{{ doc("opt_symbol") }}'
-      - name: LIQUIDATED_AMOUNT_UNADJU
+      - name: AMOUNT_UNADJ
         description: '{{ doc("complete_lending_amount_unadj") }}'
-      - name: LIQUIDATED_AMOUNT
+      - name: AMOUNT
         description: '{{ doc("complete_lending_amount") }}'
-      - name: LIQUIDATED_AMOUNT_USD
+      - name: AMOUNT_USD
         description: '{{ doc("complete_lending_amount_usd") }}'
       - name: DEBT_TOKEN
         description: '{{ doc("complete_lending_debt_asset") }}'
diff --git a/models/silver/defi/lending/complete_lending/silver__complete_lending_liquidations.sql b/models/silver/defi/lending/complete_lending/silver__complete_lending_liquidations.sql
index 8389742e..dfa28b46 100644
--- a/models/silver/defi/lending/complete_lending/silver__complete_lending_liquidations.sql
+++ b/models/silver/defi/lending/complete_lending/silver__complete_lending_liquidations.sql
@@ -98,10 +98,10 @@ exactly as (
     amount AS liquidated_amount,
     NULL AS liquidated_amount_usd,
     token AS protocol_collateral_asset,
-    liquidation_contract_address AS collateral_asset,
-    liquidation_contract_symbol AS collateral_asset_symbol,
-    collateral_token AS debt_asset,
-    collateral_symbol AS debt_asset_symbol,
+    liquidation_contract_address AS debt_asset,
+    liquidation_contract_symbol AS debt_asset_symbol,
+    collateral_token AS collateral_asset,
+    collateral_symbol AS collateral_asset_symbol,
     platform,
     'optimism' AS blockchain,
     l._LOG_ID,
@@ -137,10 +137,10 @@ sonne as (
     amount AS liquidated_amount,
     NULL AS liquidated_amount_usd,
     token AS protocol_collateral_asset,
-    liquidation_contract_address AS collateral_asset,
-    liquidation_contract_symbol AS collateral_asset_symbol,
-    collateral_token AS debt_asset,
-    collateral_symbol AS debt_asset_symbol,
+    liquidation_contract_address AS debt_asset,
+    liquidation_contract_symbol AS debt_asset_symbol,
+    collateral_token AS collateral_asset,
+    collateral_symbol AS collateral_asset_symbol,
     platform,
     'optimism' AS blockchain,
     l._LOG_ID,
@@ -176,10 +176,10 @@ tarot as (
     amount AS liquidated_amount,
     NULL AS liquidated_amount_usd,
     token AS protocol_collateral_asset,
-    liquidation_contract_address AS collateral_asset,
-    liquidation_contract_symbol AS collateral_asset_symbol,
-    collateral_token AS debt_asset,
-    collateral_symbol AS debt_asset_symbol,
+    liquidation_contract_address AS debt_asset,
+    liquidation_contract_symbol AS debt_asset_symbol,
+    collateral_token AS collateral_asset,
+    collateral_symbol AS collateral_asset_symbol,
     platform,
     'optimism' AS blockchain,
     l._LOG_ID,