fixed unit test

ajna-finance · Jul 13, 2023 · b776ba0 · b776ba0
1 parent 8fdb1a1
commit b776ba0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/erc-20-pool.ts b/src/erc-20-pool.ts
@@ -1,5 +1,4 @@
-import { BigInt, Bytes, dataSource } from "@graphprotocol/graph-ts"
-import { log } from "matchstick-as/assembly/log";
+import { BigInt, Bytes, dataSource, log } from "@graphprotocol/graph-ts"
 
 import {
   AddCollateral as AddCollateralEvent,
@@ -315,7 +314,6 @@ export function handleBucketBankruptcy(event: BucketBankruptcyEvent): void {
 
 export function handleBucketTake(event: BucketTakeEvent): void {
   const bucketTakeId    = event.transaction.hash.concatI32(event.logIndex.toI32());
-  log.info("looking up bucketTake {}", [bucketTakeId.toHexString()]);
   const bucketTake      = BucketTake.load(bucketTakeId)!
   bucketTake.borrower   = event.params.borrower
   bucketTake.taker      = event.transaction.from
@@ -410,10 +408,10 @@ export function handleBucketTake(event: BucketTakeEvent): void {
   // save entities to the store
   account.save()
   auction.save()
+  bucket.save()
+  bucketTake.save()
   loan.save()
   pool.save()
-  bucketTake.save()
-  bucket.save()
   kickerAccount.save()
   kickerLend.save()
   takerLend.save()
@@ -434,15 +432,13 @@ export function handleBucketTakeLPAwarded(
   bucketTakeLpAwarded.blockTimestamp  = event.block.timestamp
   bucketTakeLpAwarded.transactionHash = event.transaction.hash
   bucketTakeLpAwarded.save()
-  log.info("saved bucketTakeLpAwarded {}", [lpAwardedId.toHexString()]);
 
 
   // since this is emitted immediately before BucketTakeEvent, create BucketTake entity to associate it with this LP award
   const bucketTakeId   = event.transaction.hash.concatI32(event.logIndex.toI32() + 1)
   const bucketTake     = loadOrCreateBucketTake(bucketTakeId)
   bucketTake.lpAwarded = lpAwardedId
   bucketTake.save()
-  log.info("saved placeholder bucketTake {}", [bucketTakeId.toHexString()]);
 }
 
 export function handleDecreaseLPAllowance(event: DecreaseLPAllowanceEvent): void {

diff --git a/tests/erc-20-pool.test.ts b/tests/erc-20-pool.test.ts
@@ -1111,8 +1111,9 @@ describe("ERC20Pool assertions", () => {
       bondChange,
       isReward
     )
+    // implementation assumes these events happen in succession
+    newBucketTakeEvent.transaction.hash = newBucketTakeLPAwardedEvent.transaction.hash
     newBucketTakeEvent.logIndex = newBucketTakeLPAwardedEvent.logIndex.plus(ONE_BI)
-    // FIXME: cannot find this event id
     handleBucketTake(newBucketTakeEvent)
 
     /********************/
@@ -1123,25 +1124,25 @@ describe("ERC20Pool assertions", () => {
     assert.entityCount("BucketTake", 1)
     assert.fieldEquals(
       "BucketTake",
-      "0xa16081f360e3847006db660bae1c6d1b2e17ec2a01000000",
+      "0xa16081f360e3847006db660bae1c6d1b2e17ec2a02000000",
       "taker",
       `${taker.toHexString()}`
     )
     assert.fieldEquals(
       "BucketTake",
-      "0xa16081f360e3847006db660bae1c6d1b2e17ec2a01000000",
+      "0xa16081f360e3847006db660bae1c6d1b2e17ec2a02000000",
       "pool",
       `${poolAddress.toHexString()}`
     )
     assert.fieldEquals(
       "BucketTake",
-      "0xa16081f360e3847006db660bae1c6d1b2e17ec2a01000000",
+      "0xa16081f360e3847006db660bae1c6d1b2e17ec2a02000000",
       "amount",
       `${wadToDecimal(amountToTake)}`
     )
     assert.fieldEquals(
       "BucketTake",
-      "0xa16081f360e3847006db660bae1c6d1b2e17ec2a01000000",
+      "0xa16081f360e3847006db660bae1c6d1b2e17ec2a02000000",
       "collateral",
       `${wadToDecimal(collateral)}`
     )