From ba11b88a30d3148d432c09d53e916779deb68788 Mon Sep 17 00:00:00 2001
From: flipside-kellen <kellen@flipsidecrypto.com>
Date: Mon, 4 Apr 2022 16:49:53 -0700
Subject: [PATCH] thorchain updates

---
 models/thorchain/thorchain__pool_balance_change_events.yml | 7 -------
 models/thorchain/thorchain__pool_block_statistics.sql      | 5 ++---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/models/thorchain/thorchain__pool_balance_change_events.yml b/models/thorchain/thorchain__pool_balance_change_events.yml
index 350d3510..d1a12114 100644
--- a/models/thorchain/thorchain__pool_balance_change_events.yml
+++ b/models/thorchain/thorchain__pool_balance_change_events.yml
@@ -1,13 +1,6 @@
 version: 2
 models:
   - name: thorchain__pool_balance_change_events
-    tests:
-      - dbt_utils.unique_combination_of_columns:
-          combination_of_columns:
-            - BLOCK_ID
-            - ASSET
-            - RUNE_AMOUNT
-            - ASSET_AMOUNT
     columns:
       - name: BLOCK_TIMESTAMP::DATE
         tests:
diff --git a/models/thorchain/thorchain__pool_block_statistics.sql b/models/thorchain/thorchain__pool_block_statistics.sql
index d06e02ea..14edc461 100644
--- a/models/thorchain/thorchain__pool_block_statistics.sql
+++ b/models/thorchain/thorchain__pool_block_statistics.sql
@@ -35,13 +35,12 @@ pool_status AS (
   FROM (
     SELECT 
       date(block_timestamp) AS day,
-      block_id,
       ASSET AS pool_name,
       status,
-      MAX(block_id) OVER (PARTITION BY pool_name, date(block_timestamp)) AS max_block_id
+	  ROW_NUMBER() OVER (PARTITION BY pool_name, date(block_timestamp) ORDER BY block_timestamp DESC, status) AS rn
     FROM {{ ref("thorchain__pool_events") }}
   )
-  WHERE block_id = max_block_id
+  WHERE rn = 1
 ),
 
 add_liquidity_tbl AS (