fix: table name scalar_tap_ravs discrepancy

Was `scalar_tap_latest_ravs` everywhere except in the down migration. Opted for the shorter of the 2 everywhere. Signed-off-by: Alexis Asseman <[email protected]>
graphprotocol · Nov 2, 2023 · 1ce9244 · 1ce9244
1 parent f7447f7
commit 1ce9244
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 83 deletions.
diff --git a/.sqlx/query-0e46530ba12da19cedaebaab66bddcfb586bc049fa2d61740c400ae64d33d3b8.json b/.sqlx/query-0e46530ba12da19cedaebaab66bddcfb586bc049fa2d61740c400ae64d33d3b8.json
diff --git a/.sqlx/query-26e4dda54e43d15e3c747982c6c021befec9a5efd2f9d39078d9b45f79c1f31a.json b/.sqlx/query-26e4dda54e43d15e3c747982c6c021befec9a5efd2f9d39078d9b45f79c1f31a.json
diff --git a/...d3afe596556e730b48fb31edfaf14096d3dd.json → ...952e980b713a79b197f1fe17ea1c6c9d07ec.json b/...d3afe596556e730b48fb31edfaf14096d3dd.json → ...952e980b713a79b197f1fe17ea1c6c9d07ec.json
diff --git a/.sqlx/query-46a50e4bbfb5f7c57bb42fcfa17e3ffe3109b63b14aa746eacdb81288f919c16.json b/.sqlx/query-46a50e4bbfb5f7c57bb42fcfa17e3ffe3109b63b14aa746eacdb81288f919c16.json
diff --git a/.sqlx/query-b3726609aaf6bbeb8a08cbcc10f3226c8a792538eed5ae1397f5515ef43f52af.json b/.sqlx/query-b3726609aaf6bbeb8a08cbcc10f3226c8a792538eed5ae1397f5515ef43f52af.json
diff --git a/.sqlx/query-b977d0e0ce35557f5829e797975da79d651c366e54ed95687e546be1906dc48a.json b/.sqlx/query-b977d0e0ce35557f5829e797975da79d651c366e54ed95687e546be1906dc48a.json
diff --git a/.sqlx/query-bdb90bbff5d073cee9665a99601623b86576e4338009ec2fb4cd1e4b64e9f368.json b/.sqlx/query-bdb90bbff5d073cee9665a99601623b86576e4338009ec2fb4cd1e4b64e9f368.json
diff --git a/...c0e4df41a5504a3acc779d82fcdf7fdd4e79.json → ...446de1cc6b352f33825ebc4ae2de03da4263.json b/...c0e4df41a5504a3acc779d82fcdf7fdd4e79.json → ...446de1cc6b352f33825ebc4ae2de03da4263.json
diff --git a/...f5b1ce3c8594b3657436a6cd68d683ef8190.json → ...5adf6a3900d89553bdec541201fd3e282d83.json b/...f5b1ce3c8594b3657436a6cd68d683ef8190.json → ...5adf6a3900d89553bdec541201fd3e282d83.json
diff --git a/...3f102b32750519586a393c3a72c297f10d7e.json → ...397ad89619d6e111741254864e3a1eaeaa7a.json b/...3f102b32750519586a393c3a72c297f10d7e.json → ...397ad89619d6e111741254864e3a1eaeaa7a.json
diff --git a/migrations/20230915230734_tap_ravs.up.sql b/migrations/20230915230734_tap_ravs.up.sql
@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS scalar_tap_latest_ravs (
+CREATE TABLE IF NOT EXISTS scalar_tap_ravs (
     allocation_id CHAR(40) NOT NULL,
     sender_address CHAR(40) NOT NULL,
     rav JSON NOT NULL,

diff --git a/tap_agent/src/tap/account.rs b/tap_agent/src/tap/account.rs
@@ -213,7 +213,7 @@ impl Account {
                 SELECT 
                     rav -> 'message' ->> 'timestamp_ns' AS timestamp_ns 
                 FROM 
-                    scalar_tap_latest_ravs 
+                    scalar_tap_ravs 
                 WHERE 
                     allocation_id = $1 
                     AND sender_address = $2
@@ -356,7 +356,7 @@ impl Account {
             // Mark the last RAV as last in the DB as a cue for the indexer-agent.
             let updated_rows = sqlx::query!(
                 r#"
-                    UPDATE scalar_tap_latest_ravs
+                    UPDATE scalar_tap_ravs
                     SET is_last = true
                     WHERE allocation_id = $1 AND sender_address = $2
                     RETURNING *
@@ -751,7 +751,7 @@ mod tests {
         let latest_rav = sqlx::query!(
             r#"
                 SELECT rav
-                FROM scalar_tap_latest_ravs
+                FROM scalar_tap_ravs
                 WHERE allocation_id = $1 AND sender_address = $2
             "#,
             ALLOCATION_ID
@@ -814,7 +814,7 @@ mod tests {
         let latest_rav = sqlx::query!(
             r#"
                 SELECT rav
-                FROM scalar_tap_latest_ravs
+                FROM scalar_tap_ravs
                 WHERE allocation_id = $1 AND sender_address = $2
             "#,
             ALLOCATION_ID

diff --git a/tap_agent/src/tap/rav_storage_adapter.rs b/tap_agent/src/tap/rav_storage_adapter.rs
@@ -29,7 +29,7 @@ impl RAVStorageAdapterTrait for RAVStorageAdapter {
     async fn update_last_rav(&self, rav: SignedRAV) -> Result<(), Self::AdapterError> {
         let _fut = sqlx::query!(
             r#"
-                INSERT INTO scalar_tap_latest_ravs (allocation_id, sender_address, rav)
+                INSERT INTO scalar_tap_ravs (allocation_id, sender_address, rav)
                 VALUES ($1, $2, $3)
                 ON CONFLICT (allocation_id, sender_address)
                 DO UPDATE SET rav = $3
@@ -55,7 +55,7 @@ impl RAVStorageAdapterTrait for RAVStorageAdapter {
         let latest_rav = sqlx::query!(
             r#"
                 SELECT rav
-                FROM scalar_tap_latest_ravs
+                FROM scalar_tap_ravs
                 WHERE allocation_id = $1 AND sender_address = $2
             "#,
             self.allocation_id

diff --git a/tap_agent/src/tap/test_utils.rs b/tap_agent/src/tap/test_utils.rs
@@ -124,7 +124,7 @@ pub async fn store_receipt(pgpool: &PgPool, signed_receipt: SignedReceipt) -> Re
 pub async fn store_rav(pgpool: &PgPool, signed_rav: SignedRAV, sender: Address) -> Result<()> {
     sqlx::query!(
         r#"
-            INSERT INTO scalar_tap_latest_ravs (
+            INSERT INTO scalar_tap_ravs (
                 allocation_id, sender_address, rav
             )
             VALUES ($1, $2, $3)