Skip to content

Commit

Permalink
refactor(subgraph): update merkle tree var name
Browse files Browse the repository at this point in the history
  • Loading branch information
cedoor committed Jan 23, 2024
1 parent 0c0b5b0 commit f508925
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion apps/subgraph/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ type MerkleTree @entity {
id: ID!
depth: Int!
root: BigInt
numberOfLeaves: Int!
size: Int!
group: Group!
}

Expand Down
8 changes: 4 additions & 4 deletions apps/subgraph/src/semaphore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function createGroup(event: GroupCreated): void {
log.info("Creating group '{}'", [group.id])

merkleTree.depth = 0
merkleTree.numberOfLeaves = 0
merkleTree.size = 0
merkleTree.group = group.id

group.timestamp = event.block.timestamp
Expand Down Expand Up @@ -76,12 +76,12 @@ export function addMember(event: MemberAdded): void {
member.group = merkleTree.group
member.identityCommitment = event.params.identityCommitment
member.timestamp = event.block.timestamp
member.index = merkleTree.numberOfLeaves
member.index = merkleTree.size

member.save()

merkleTree.root = event.params.merkleTreeRoot
merkleTree.numberOfLeaves += 1
merkleTree.size += 1

merkleTree.save()

Expand Down Expand Up @@ -187,7 +187,7 @@ export function addMembers(event: MembersAdded): void {
}

merkleTree.root = event.params.merkleTreeRoot
merkleTree.numberOfLeaves += identityCommitments.length
merkleTree.size += identityCommitments.length

merkleTree.save()
}
Expand Down
6 changes: 3 additions & 3 deletions apps/subgraph/tests/semaphore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe("Semaphore subgraph", () => {
assert.fieldEquals("Group", groupId.toString(), "merkleTree", groupId.toString())

assert.fieldEquals("MerkleTree", groupId.toString(), "depth", "0")
assert.fieldEquals("MerkleTree", groupId.toString(), "numberOfLeaves", "0")
assert.fieldEquals("MerkleTree", groupId.toString(), "size", "0")
assert.fieldEquals("MerkleTree", groupId.toString(), "group", groupId.toString())
})
})
Expand Down Expand Up @@ -84,7 +84,7 @@ describe("Semaphore subgraph", () => {
assert.fieldEquals("Member", id, "group", groupId.toString())

assert.fieldEquals("MerkleTree", groupId.toString(), "root", "999")
assert.fieldEquals("MerkleTree", groupId.toString(), "numberOfLeaves", "1")
assert.fieldEquals("MerkleTree", groupId.toString(), "size", "1")
})
})

Expand Down Expand Up @@ -150,7 +150,7 @@ describe("Semaphore subgraph", () => {
assert.fieldEquals("Member", id, "group", groupId.toString())

assert.fieldEquals("MerkleTree", groupId.toString(), "root", "999")
assert.fieldEquals("MerkleTree", groupId.toString(), "numberOfLeaves", "3")
assert.fieldEquals("MerkleTree", groupId.toString(), "size", "3")
})
})

Expand Down

0 comments on commit f508925

Please sign in to comment.