update to new Table format (block,timestamp)

pinax-network · Nov 8, 2023 · 88c8b30 · 88c8b30
1 parent 0b6a68d
commit 88c8b30
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/src/queries.spec.ts b/src/queries.spec.ts
@@ -38,9 +38,6 @@ test("getContracts", () => {
         formatSQL(`SELECT * FROM Contracts`)
     );
 
-    expect(formatSQL(getContracts(parameter))).toContain(
-        formatSQL(`JOIN blocks ON blocks.block_id = Contracts.block_id`)
-    );
 
     expect(formatSQL(getContracts(parameter))).toContain(
         formatSQL(`WHERE (chain == '${chain}' AND address == '${address}')`)
@@ -107,9 +104,6 @@ test("getTotalSupply", () => {
         formatSQL(`FROM TotalSupply`)
     );
 
-    expect(formatSQL(getTotalSupply(parameters))).toContain(
-        formatSQL(`JOIN blocks ON blocks.block_id = TotalSupply.block_id`)
-    );
 
     expect(formatSQL(getTotalSupply(parameters))).toContain(
         formatSQL(`LEFT JOIN Contracts ON Contracts.address = TotalSupply.address`)
@@ -167,9 +161,6 @@ test("getBalanceChabge", () => {
         formatSQL(`FROM balance_changes`)
     );
 
-    expect(formatSQL(getBalanceChanges(parameters))).toContain(
-        formatSQL(`JOIN blocks ON blocks.block_id = balance_changes.block_id`)
-    );
 
     expect(formatSQL(getBalanceChanges(parameters))).toContain(
         formatSQL(

diff --git a/src/queries.ts b/src/queries.ts
@@ -42,8 +42,7 @@ export function getTotalSupply(searchParams: URLSearchParams, example?: boolean)
     FROM ${table} `;
 
 
-    // JOIN block table
-    query += ` JOIN blocks ON blocks.block_id = ${table}.block_id`;
+    // JOIN Contracts table
     query += ` LEFT JOIN Contracts ON ${contractTable}.address = ${table}.address`;
     if (!example) {
         // WHERE statements
@@ -86,8 +85,6 @@ export function getContracts(searchParams: URLSearchParams, example?: boolean) {
     let query = `SELECT * FROM ${table} `
 
 
-    // JOIN block table
-    query += ` JOIN blocks ON blocks.block_id = ${table}.block_id`;
     if (!example) {
         // WHERE statements
         const where = [];
@@ -136,8 +133,6 @@ export function getBalanceChanges(searchParams: URLSearchParams, example?: boole
     timestamp
     FROM ${table} `;
 
-    // JOIN block table
-    query += ` JOIN blocks ON blocks.block_id = ${table}.block_id`;
     query += ` LEFT JOIN Contracts ON ${contractTable}.address = ${table}.contract`;
 
     if (!example) {