Skip to content

Commit 90f4e15

Browse files
committed
Index LendingPool, RemittanceNFT, and MultisigGovernance Events (#437)
1 parent e0e411b commit 90f4e15

3 files changed

Lines changed: 36 additions & 4 deletions

File tree

backend/jest.config.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@ export default {
1515
"^(\\.{1,2}/.*)\\.js$": "$1",
1616
},
1717
testMatch: ["**/*.test.ts", "**/*.spec.ts"],
18-
setupFilesAfterEnv: ["<rootDir>/src/tests/jest.setup.ts"],
18+
// setupFilesAfterEnv: ["<rootDir>/src/tests/jest.setup.ts"],
19+
20+
// 👇 Point to the actual location of setup.ts
21+
setupFilesAfterEnv: ["<rootDir>/src/__tests__/setup.ts"],
1922
};

backend/src/__tests__/setup.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { db } from "../src/db/connection";
2+
import Redis from "ioredis";
3+
4+
let redis: Redis;
5+
6+
beforeAll(async () => {
7+
redis = new Redis(process.env.REDIS_URL);
8+
if (db.connect) {
9+
await db.connect();
10+
}
11+
});
12+
13+
afterAll(async () => {
14+
if (redis) {
15+
await redis.quit();
16+
}
17+
if (db.end) {
18+
await db.end();
19+
}
20+
});

contracts/multisig_governance/src/lib.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,10 @@ impl MultisigGovernance {
637637

638638
#[ink(message)]
639639
pub fn approve_proposal(&mut self, proposal_id: u64) -> Result<(), String> {
640-
let mut proposal = self.proposals.get(proposal_id).ok_or("Proposal not found")?;
640+
let mut proposal = self
641+
.proposals
642+
.get(proposal_id)
643+
.ok_or("Proposal not found")?;
641644
let current_ledger = Self::current_ledger();
642645

643646
if current_ledger > proposal.expires_at {
@@ -655,7 +658,10 @@ impl MultisigGovernance {
655658

656659
#[ink(message)]
657660
pub fn finalize_proposal(&mut self, proposal_id: u64) -> Result<(), String> {
658-
let mut proposal = self.proposals.get(proposal_id).ok_or("Proposal not found")?;
661+
let mut proposal = self
662+
.proposals
663+
.get(proposal_id)
664+
.ok_or("Proposal not found")?;
659665
let current_ledger = Self::current_ledger();
660666

661667
if current_ledger > proposal.expires_at {
@@ -674,7 +680,10 @@ impl MultisigGovernance {
674680

675681
#[ink(message)]
676682
pub fn cancel_expired_proposal(&mut self, proposal_id: u64) -> Result<(), String> {
677-
let proposal = self.proposals.get(proposal_id).ok_or("Proposal not found")?;
683+
let proposal = self
684+
.proposals
685+
.get(proposal_id)
686+
.ok_or("Proposal not found")?;
678687
let current_ledger = Self::current_ledger();
679688

680689
if current_ledger <= proposal.expires_at {

0 commit comments

Comments
 (0)