diff --git a/subgraphs/chamber/abis/Chamber.json b/subgraphs/chamber/abis/Chamber.json index 14f9a01..492cd75 100644 --- a/subgraphs/chamber/abis/Chamber.json +++ b/subgraphs/chamber/abis/Chamber.json @@ -540,35 +540,22 @@ }, { "type": "event", - "name": "ChangedGuard", + "name": "ApprovedProposal", "inputs": [ { - "name": "guard", - "type": "address", - "indexed": true, - "internalType": "address" - } - ], - "anonymous": false - }, - { - "type": "event", - "name": "Demoted", - "inputs": [ - { - "name": "demoter", - "type": "address", + "name": "proposalId", + "type": "uint256", "indexed": false, - "internalType": "address" + "internalType": "uint256" }, { - "name": "amt", + "name": "tokenId", "type": "uint256", "indexed": false, "internalType": "uint256" }, { - "name": "tokenId", + "name": "approvals", "type": "uint256", "indexed": false, "internalType": "uint256" @@ -578,35 +565,66 @@ }, { "type": "event", - "name": "Initialized", + "name": "CanceledProposal", "inputs": [ { - "name": "version", - "type": "uint8", + "name": "proposalId", + "type": "uint256", "indexed": false, - "internalType": "uint8" + "internalType": "uint256" } ], "anonymous": false }, { "type": "event", - "name": "Promoted", + "name": "ChangedGuard", "inputs": [ { - "name": "promoter", + "name": "guard", "type": "address", - "indexed": false, + "indexed": true, "internalType": "address" - }, + } + ], + "anonymous": false + }, + { + "type": "event", + "name": "CreatedProposal", + "inputs": [ { - "name": "amt", + "name": "proposalId", "type": "uint256", "indexed": false, "internalType": "uint256" }, { - "name": "tokenId", + "name": "target", + "type": "address[]", + "indexed": false, + "internalType": "address[]" + }, + { + "name": "value", + "type": "uint256[]", + "indexed": false, + "internalType": "uint256[]" + }, + { + "name": "data", + "type": "bytes[]", + "indexed": false, + "internalType": "bytes[]" + }, + { + "name": "voters", + "type": "uint256[5]", + "indexed": false, + "internalType": "uint256[5]" + }, + { + "name": "nonce", "type": "uint256", "indexed": false, "internalType": "uint256" @@ -616,22 +634,22 @@ }, { "type": "event", - "name": "ProposalApproved", + "name": "Demotion", "inputs": [ { - "name": "proposalId", - "type": "uint256", + "name": "demoter", + "type": "address", "indexed": false, - "internalType": "uint256" + "internalType": "address" }, { - "name": "tokenId", + "name": "amt", "type": "uint256", "indexed": false, "internalType": "uint256" }, { - "name": "approvals", + "name": "tokenId", "type": "uint256", "indexed": false, "internalType": "uint256" @@ -641,7 +659,7 @@ }, { "type": "event", - "name": "ProposalCanceled", + "name": "ExecutedProposal", "inputs": [ { "name": "proposalId", @@ -654,53 +672,35 @@ }, { "type": "event", - "name": "ProposalCreated", + "name": "Initialized", "inputs": [ { - "name": "proposalId", - "type": "uint256", - "indexed": false, - "internalType": "uint256" - }, - { - "name": "target", - "type": "address[]", - "indexed": false, - "internalType": "address[]" - }, - { - "name": "value", - "type": "uint256[]", - "indexed": false, - "internalType": "uint256[]" - }, - { - "name": "data", - "type": "bytes[]", - "indexed": false, - "internalType": "bytes[]" - }, - { - "name": "voters", - "type": "uint256[5]", - "indexed": false, - "internalType": "uint256[5]" - }, - { - "name": "nonce", - "type": "uint256", + "name": "version", + "type": "uint8", "indexed": false, - "internalType": "uint256" + "internalType": "uint8" } ], "anonymous": false }, { "type": "event", - "name": "ProposalExecuted", + "name": "Promotion", "inputs": [ { - "name": "proposalId", + "name": "promoter", + "type": "address", + "indexed": false, + "internalType": "address" + }, + { + "name": "amt", + "type": "uint256", + "indexed": false, + "internalType": "uint256" + }, + { + "name": "tokenId", "type": "uint256", "indexed": false, "internalType": "uint256" diff --git a/subgraphs/chamber/schema.graphql b/subgraphs/chamber/schema.graphql index 6f15cb4..edfde0a 100644 --- a/subgraphs/chamber/schema.graphql +++ b/subgraphs/chamber/schema.graphql @@ -28,7 +28,7 @@ type ChangedGuard @entity(immutable: true) { transactionHash: Bytes! } -type Demoted @entity(immutable: true) { +type Demotion @entity(immutable: true) { id: ID! demoter: Bytes! # address amt: BigInt! # uint256 @@ -48,7 +48,7 @@ type Initialized @entity(immutable: true) { transactionHash: Bytes! } -type Promoted @entity(immutable: true) { +type Promotion @entity(immutable: true) { id: ID! promoter: Bytes! # address amt: BigInt! # uint256 @@ -59,7 +59,7 @@ type Promoted @entity(immutable: true) { transactionHash: Bytes! } -type ProposalApproved @entity(immutable: true) { +type ApprovedProposal @entity(immutable: true) { id: ID! proposalId: BigInt! # uint256 tokenId: BigInt! # uint256 @@ -70,7 +70,7 @@ type ProposalApproved @entity(immutable: true) { transactionHash: Bytes! } -type ProposalCreated @entity(immutable: true) { +type CreatedProposal @entity(immutable: true) { id: ID! proposalId: BigInt! # uint256 target: [Bytes!]! # address[] @@ -84,7 +84,7 @@ type ProposalCreated @entity(immutable: true) { transactionHash: Bytes! } -type ProposalExecuted @entity(immutable: true) { +type ExecutedProposal @entity(immutable: true) { id: ID! proposalId: BigInt! # uint256 contractAddress: Bytes! # address @@ -93,7 +93,7 @@ type ProposalExecuted @entity(immutable: true) { transactionHash: Bytes! } -type ProposalCanceled @entity(immutable: true) { +type CanceledProposal @entity(immutable: true) { id: ID! proposalId: BigInt! # uint256 contractAddress: Bytes! # address diff --git a/subgraphs/chamber/src/chamber.ts b/subgraphs/chamber/src/chamber.ts index 330cf99..2c11c3e 100644 --- a/subgraphs/chamber/src/chamber.ts +++ b/subgraphs/chamber/src/chamber.ts @@ -3,26 +3,26 @@ import { Bytes } from "@graphprotocol/graph-ts"; import { ChangedGuard as ChangedGuardEvent, - Demoted as DemotedEvent, + Demotion as DemotionEvent, Initialized as InitializedEvent, - Promoted as PromotedEvent, - ProposalApproved as ProposalApprovedEvent, - ProposalCreated as ProposalCreatedEvent, - ProposalExecuted as ProposalExecutedEvent, - ProposalCanceled as ProposalCanceledEvent, + Promotion as PromotionEvent, + ApprovedProposal as ApprovedProposalEvent, + CreatedProposal as CreatedProposalEvent, + ExecutedProposal as ExecutedProposalEvent, + CanceledProposal as CanceledProposalEvent, ReceivedEther as ReceivedEtherEvent, ReceivedFallback as ReceivedFallbackEvent, } from "../generated/templates/Chamber/Chamber"; import { ChangedGuard, - Demoted, + Demotion, Initialized, - Promoted, - ProposalApproved, - ProposalCreated, - ProposalExecuted, - ProposalCanceled, + Promotion, + ApprovedProposal, + CreatedProposal, + ExecutedProposal, + CanceledProposal, ReceivedEther, ReceivedFallback, } from "../generated/schema"; @@ -40,19 +40,19 @@ export function handleChangedGuard(event: ChangedGuardEvent): void { changedGuardTx.save(); } -export function handleDemoted(event: DemotedEvent): void { +export function handleDemotion(event: DemotionEvent): void { const id = createId(event.transaction.hash, event.logIndex); - const demotedTx = new Demoted(id); - demotedTx.demoter = event.params.demoter; - demotedTx.amt = event.params.amt; - demotedTx.tokenId = event.params.tokenId; - demotedTx.contractAddress = changetype(event.transaction.to); + const demotionTx = new Demotion(id); + demotionTx.demoter = event.params.demoter; + demotionTx.amt = event.params.amt; + demotionTx.tokenId = event.params.tokenId; + demotionTx.contractAddress = changetype(event.transaction.to); - demotedTx.blockNumber = event.block.number; - demotedTx.blockTimestamp = event.block.timestamp; - demotedTx.transactionHash = event.transaction.hash; + demotionTx.blockNumber = event.block.number; + demotionTx.blockTimestamp = event.block.timestamp; + demotionTx.transactionHash = event.transaction.hash; - demotedTx.save(); + demotionTx.save(); } export function handleInitialized(event: InitializedEvent): void { @@ -68,78 +68,78 @@ export function handleInitialized(event: InitializedEvent): void { initializedTx.save(); } -export function handlePromoted(event: PromotedEvent): void { +export function handlePromotion(event: PromotionEvent): void { const id = createId(event.transaction.hash, event.logIndex); - const promotedTx = new Promoted(id); - promotedTx.promoter = event.params.promoter; - promotedTx.amt = event.params.amt; - promotedTx.tokenId = event.params.tokenId; - promotedTx.contractAddress = changetype(event.transaction.to); + const promotionTx = new Promotion(id); + promotionTx.promoter = event.params.promoter; + promotionTx.amt = event.params.amt; + promotionTx.tokenId = event.params.tokenId; + promotionTx.contractAddress = changetype(event.transaction.to); - promotedTx.blockNumber = event.block.number; - promotedTx.blockTimestamp = event.block.timestamp; - promotedTx.transactionHash = event.transaction.hash; + promotionTx.blockNumber = event.block.number; + promotionTx.blockTimestamp = event.block.timestamp; + promotionTx.transactionHash = event.transaction.hash; - promotedTx.save(); + promotionTx.save(); } -export function handleProposalApproved(event: ProposalApprovedEvent): void { +export function handleApprovedProposal(event: ApprovedProposalEvent): void { const id = createId(event.transaction.hash, event.logIndex); - const proposalApprovedTx = new ProposalApproved(id); - proposalApprovedTx.proposalId = event.params.proposalId; - proposalApprovedTx.tokenId = event.params.tokenId; - proposalApprovedTx.approvals = event.params.approvals; - proposalApprovedTx.contractAddress = changetype(event.transaction.to); + const approvedProposalTx = new ApprovedProposal(id); + approvedProposalTx.proposalId = event.params.proposalId; + approvedProposalTx.tokenId = event.params.tokenId; + approvedProposalTx.approvals = event.params.approvals; + approvedProposalTx.contractAddress = changetype(event.transaction.to); - proposalApprovedTx.blockNumber = event.block.number; - proposalApprovedTx.blockTimestamp = event.block.timestamp; - proposalApprovedTx.transactionHash = event.transaction.hash; + approvedProposalTx.blockNumber = event.block.number; + approvedProposalTx.blockTimestamp = event.block.timestamp; + approvedProposalTx.transactionHash = event.transaction.hash; - proposalApprovedTx.save(); + approvedProposalTx.save(); } -export function handleProposalCreated(event: ProposalCreatedEvent): void { +export function handleCreatedProposal(event: CreatedProposalEvent): void { const id = createId(event.transaction.hash, event.logIndex); - const proposalCreatedTx = new ProposalCreated(id); - proposalCreatedTx.proposalId = event.params.proposalId; - proposalCreatedTx.target = changetype(event.params.target); - proposalCreatedTx.value = event.params.value; - proposalCreatedTx.data = event.params.data; - proposalCreatedTx.voters = event.params.voters; - proposalCreatedTx.nonce = event.params.nonce; - proposalCreatedTx.contractAddress = changetype(event.transaction.to); - - proposalCreatedTx.blockNumber = event.block.number; - proposalCreatedTx.blockTimestamp = event.block.timestamp; - proposalCreatedTx.transactionHash = event.transaction.hash; - - proposalCreatedTx.save(); + const createdProposalTx = new CreatedProposal(id); + createdProposalTx.proposalId = event.params.proposalId; + createdProposalTx.target = changetype(event.params.target); + createdProposalTx.value = event.params.value; + createdProposalTx.data = event.params.data; + createdProposalTx.voters = event.params.voters; + createdProposalTx.nonce = event.params.nonce; + createdProposalTx.contractAddress = changetype(event.transaction.to); + + createdProposalTx.blockNumber = event.block.number; + createdProposalTx.blockTimestamp = event.block.timestamp; + createdProposalTx.transactionHash = event.transaction.hash; + + createdProposalTx.save(); } -export function handleProposalExecuted(event: ProposalExecutedEvent): void { +export function handleExecutedProposal(event: ExecutedProposalEvent): void { const id = createId(event.transaction.hash, event.logIndex); - const proposalExecutedTx = new ProposalExecuted(id); - proposalExecutedTx.proposalId = event.params.proposalId; - proposalExecutedTx.contractAddress = changetype(event.transaction.to); + const executedProposalTx = new ExecutedProposal(id); + executedProposalTx.proposalId = event.params.proposalId; + executedProposalTx.contractAddress = changetype(event.transaction.to); - proposalExecutedTx.blockNumber = event.block.number; - proposalExecutedTx.blockTimestamp = event.block.timestamp; - proposalExecutedTx.transactionHash = event.transaction.hash; + executedProposalTx.blockNumber = event.block.number; + executedProposalTx.blockTimestamp = event.block.timestamp; + executedProposalTx.transactionHash = event.transaction.hash; - proposalExecutedTx.save(); + executedProposalTx.save(); } -export function handleProposalCanceled(event: ProposalCanceledEvent): void { +export function handleCanceledProposal(event: CanceledProposalEvent): void { const id = createId(event.transaction.hash, event.logIndex); - const proposalCanceledTx = new ProposalCanceled(id); - proposalCanceledTx.proposalId = event.params.proposalId; - proposalCanceledTx.contractAddress = changetype(event.transaction.to); + const canceledProposalTx = new CanceledProposal(id); + canceledProposalTx.proposalId = event.params.proposalId; + canceledProposalTx.contractAddress = changetype(event.transaction.to); - proposalCanceledTx.blockNumber = event.block.number; - proposalCanceledTx.blockTimestamp = event.block.timestamp; - proposalCanceledTx.transactionHash = event.transaction.hash; + canceledProposalTx.blockNumber = event.block.number; + canceledProposalTx.blockTimestamp = event.block.timestamp; + canceledProposalTx.transactionHash = event.transaction.hash; - proposalCanceledTx.save(); + canceledProposalTx.save(); } export function handleReceivedEther(event: ReceivedEtherEvent): void { diff --git a/subgraphs/chamber/subgraph.yaml b/subgraphs/chamber/subgraph.yaml index 0780ad6..b2bae96 100644 --- a/subgraphs/chamber/subgraph.yaml +++ b/subgraphs/chamber/subgraph.yaml @@ -39,12 +39,13 @@ templates: language: wasm/assemblyscript entities: - ChangedGuard - - Demoted + - Demotion - Initialized - - Promoted - - ProposalApproved - - ProposalCreated - - ProposalExecuted + - Promotion + - ApprovedProposal + - CreatedProposal + - ExecutedProposal + - CanceledProposal - ReceivedEther - ReceivedFallback abis: @@ -53,20 +54,20 @@ templates: eventHandlers: - event: ChangedGuard(indexed address) handler: handleChangedGuard - - event: Demoted(address,uint256,uint256) - handler: handleDemoted + - event: Demotion(address,uint256,uint256) + handler: handleDemotion - event: Initialized(uint8) handler: handleInitialized - - event: Promoted(address,uint256,uint256) - handler: handlePromoted - - event: ProposalApproved(uint256,uint256,uint256) - handler: handleProposalApproved - - event: ProposalCreated(uint256,address[],uint256[],bytes[],uint256[5],uint256) - handler: handleProposalCreated - - event: ProposalExecuted(uint256) - handler: handleProposalExecuted - - event: ProposalCanceled(uint256) - handler: handleProposalCanceled + - event: Promotion(address,uint256,uint256) + handler: handlePromotion + - event: ApprovedProposal(uint256,uint256,uint256) + handler: handleApprovedProposal + - event: CreatedProposal(uint256,address[],uint256[],bytes[],uint256[5],uint256) + handler: handleCreatedProposal + - event: ExecutedProposal(uint256) + handler: handleExecutedProposal + - event: CanceledProposal(uint256) + handler: handleCanceledProposal - event: ReceivedEther(indexed address,uint256) handler: handleReceivedEther - event: ReceivedFallback(indexed address,uint256) diff --git a/subgraphs/chamber/tests/chamber.test.ts b/subgraphs/chamber/tests/chamber.test.ts index ac9a126..ec9b1df 100644 --- a/subgraphs/chamber/tests/chamber.test.ts +++ b/subgraphs/chamber/tests/chamber.test.ts @@ -2,52 +2,52 @@ import { describe, test } from "matchstick-as"; import { ChangedGuard, - Demoted, + Demotion, Initialized, - Promoted, - ProposalApproved, - // ProposalCreated, - ProposalExecuted, - ProposalCanceled, + Promotion, + ApprovedProposal, + // CreatedProposal, + ExecutedProposal, + CanceledProposal, ReceivedEther, ReceivedFallback, } from "../generated/templates/Chamber/Chamber"; import { handleChangedGuard, - handleDemoted, + handleDemotion, handleInitialized, - handlePromoted, - handleProposalApproved, - // handleProposalCreated, - handleProposalExecuted, - handleProposalCanceled, + handlePromotion, + handleApprovedProposal, + // handleCreatedProposal, + handleExecutedProposal, + handleCanceledProposal, handleReceivedEther, handleReceivedFallback, } from "../src/chamber"; import { createChangedGuardEvent, - createDemotedEvent, + createDemotionEvent, createInitializedEvent, - createPromotedEvent, - createProposalApprovedEvent, - // createProposalCreatedEvent, - createProposalExecutedEvent, - createProposalCanceledEvent, + createPromotionEvent, + createApprovedProposalEvent, + // createCreatedProposalEvent, + createExecutedProposalEvent, + createCanceledProposalEvent, createReceivedEtherEvent, createReceivedFallbackEvent, } from "./helpers/utils"; import { expectChangedGuardAdded, - expectDemotedAdded, + expectDemotionAdded, expectInitializedAdded, - expectPromotedAdded, - expectProposalApprovedAdded, - // expectProposalCreatedAdded, - expectProposalExecutedAdded, - expectProposalCanceledAdded, + expectPromotionAdded, + expectApprovedProposalAdded, + // expectCreatedProposalAdded, + expectExecutedProposalAdded, + expectCanceledProposalAdded, expectReceivedEtherAdded, expectReceivedFallbackAdded, } from "./helpers/assertions"; @@ -67,19 +67,19 @@ describe("Chamber Test", () => { }); }); - describe("Test Demoted", () => { - const createMockDemotedEvent = ( + describe("Test Demotion", () => { + const createMockDemotionEvent = ( demoter: string = "0x8e1aa1674d9fc9f0dca4a4d31db85e65d216666c", amt: i32 = 100, tokenId: i32 = 1 - ): Demoted => { - const event = createDemotedEvent(demoter, amt, tokenId); + ): Demotion => { + const event = createDemotionEvent(demoter, amt, tokenId); return event; }; - test("Handel Demoted Tx", () => { - const event = createMockDemotedEvent(); - handleDemoted(event); - expectDemotedAdded(event); + test("Handel Demotion Tx", () => { + const event = createMockDemotionEvent(); + handleDemotion(event); + expectDemotionAdded(event); }); }); @@ -95,48 +95,48 @@ describe("Chamber Test", () => { }); }); - describe("Test Promoted", () => { - const createMockPromotedEvent = ( + describe("Test Promotion", () => { + const createMockPromotionEvent = ( promoter: string = "0x8e1aa1674d9fc9f0dca4a4d31db85e65d216666c", amt: i32 = 100, tokenId: i32 = 1 - ): Promoted => { - const event = createPromotedEvent(promoter, amt, tokenId); + ): Promotion => { + const event = createPromotionEvent(promoter, amt, tokenId); return event; }; - test("Handel Promoted Tx", () => { - const event = createMockPromotedEvent(); - handlePromoted(event); - expectPromotedAdded(event); + test("Handel Promotion Tx", () => { + const event = createMockPromotionEvent(); + handlePromotion(event); + expectPromotionAdded(event); }); }); - describe("Test ProposalApproved", () => { - const createMockProposalApprovedEvent = ( + describe("Test ApprovedProposal", () => { + const createMockApprovedProposalEvent = ( proposalId: i32 = 1, tokenId: i32 = 1, approvals: i32 = 1 - ): ProposalApproved => { - const event = createProposalApprovedEvent(proposalId, tokenId, approvals); + ): ApprovedProposal => { + const event = createApprovedProposalEvent(proposalId, tokenId, approvals); return event; }; - test("Handel ProposalApproved Tx", () => { - const event = createMockProposalApprovedEvent(); - handleProposalApproved(event); - expectProposalApprovedAdded(event); + test("Handel ApprovedProposal Tx", () => { + const event = createMockApprovedProposalEvent(); + handleApprovedProposal(event); + expectApprovedProposalAdded(event); }); }); - // describe ("Test ProposalCreated", () => { - // const createMockProposalCreatedEvent = ( + // describe ("Test CreatedProposal", () => { + // const createMockCreatedProposalEvent = ( // proposalId: i32 = 1, // target: string[] = ['0x2e0049b05217290087BA613290BaCC761d7adD04','0x8E1aA1674D9Fc9f0dca4a4D31db85E65D216666c'] , // value: i32[] = [1,1], // data: string[] = ['',''], // voters: i32[] = [1,2,3,4,5], // nonce: i32 = 1, - // ) : ProposalCreated => { - // const event = createProposalCreatedEvent( + // ) : CreatedProposal => { + // const event = createCreatedProposalEvent( // proposalId, // target, // value, @@ -146,34 +146,34 @@ describe("Chamber Test", () => { // ); // return event; // }; - // test ("Handel ProposalCreated Tx", () => { - // const event = createMockProposalCreatedEvent(); - // handleProposalCreated(event); - // expectProposalCreatedAdded(event); + // test ("Handel CreatedProposal Tx", () => { + // const event = createMockCreatedProposalEvent(); + // handleCreatedProposal(event); + // expectCreatedProposalAdded(event); // }) // }) - describe("Test ProposalExecuted", () => { - const createMockProposalExecutedEvent = (proposalId: i32 = 1): ProposalExecuted => { - const event = createProposalExecutedEvent(proposalId); + describe("Test ExecutedProposal", () => { + const createMockExecutedProposalEvent = (proposalId: i32 = 1): ExecutedProposal => { + const event = createExecutedProposalEvent(proposalId); return event; }; - test("Handel ProposalExecuted Tx", () => { - const event = createMockProposalExecutedEvent(); - handleProposalExecuted(event); - expectProposalExecutedAdded(event); + test("Handel ExecutedProposal Tx", () => { + const event = createMockExecutedProposalEvent(); + handleExecutedProposal(event); + expectExecutedProposalAdded(event); }); }); - describe("Test ProposalCanceled", () => { - const createMockProposalCanceledEvent = (proposalId: i32 = 1): ProposalCanceled => { - const event = createProposalCanceledEvent(proposalId); + describe("Test CanceledProposal", () => { + const createMockCanceledProposalEvent = (proposalId: i32 = 1): CanceledProposal => { + const event = createCanceledProposalEvent(proposalId); return event; }; - test("Handel ProposalCanceled Tx", () => { - const event = createMockProposalCanceledEvent(); - handleProposalCanceled(event); - expectProposalCanceledAdded(event); + test("Handel CanceledProposal Tx", () => { + const event = createMockCanceledProposalEvent(); + handleCanceledProposal(event); + expectCanceledProposalAdded(event); }); }); diff --git a/subgraphs/chamber/tests/helpers/assertions.ts b/subgraphs/chamber/tests/helpers/assertions.ts index dc6feb4..d62bcc5 100644 --- a/subgraphs/chamber/tests/helpers/assertions.ts +++ b/subgraphs/chamber/tests/helpers/assertions.ts @@ -2,13 +2,13 @@ import { ChamberDeployed as ChamberDeployedTx, OwnershipTransferred as OwnershipTransferredTx, ChangedGuard as ChangedGuardTx, - Demoted as DemotedTx, + Demotion as DemotionTx, Initialized as InitializeTx, - Promoted as PromotedTx, - ProposalApproved as ProposalApprovedTx, - ProposalCreated as ProposalCreatedTx, - ProposalExecuted as ProposalExecutedTx, - ProposalCanceled as ProposalCanceledTx, + Promotion as PromotionTx, + ApprovedProposal as ApprovedProposalTx, + CreatedProposal as CreatedProposalTx, + ExecutedProposal as ExecutedProposalTx, + CanceledProposal as CanceledProposalTx, ReceivedEther as ReceivedEtherTx, ReceivedFallback as ReceivedFallbackTX, } from "../../generated/schema"; @@ -17,13 +17,13 @@ import { ChamberDeployed, OwnershipTransferred } from "../../generated/Registry/ import { ChangedGuard, - Demoted, + Demotion, Initialized, - Promoted, - ProposalApproved, - ProposalCreated, - ProposalExecuted, - ProposalCanceled, + Promotion, + ApprovedProposal, + CreatedProposal, + ExecutedProposal, + CanceledProposal, ReceivedEther, ReceivedFallback, } from "../../generated/templates/Chamber/Chamber"; @@ -61,14 +61,14 @@ export const expectChangedGuardAdded = (event: ChangedGuard): void => { assert.bytesEquals(event.params.guard, changedGuardTx.guard); }; -export const expectDemotedAdded = (event: Demoted): void => { +export const expectDemotionAdded = (event: Demotion): void => { const id = createId(event.transaction.hash, event.transactionLogIndex); - const demotedTx = DemotedTx.load(id); - assert.assertNotNull(demotedTx); - if (!demotedTx) return; - assert.bytesEquals(event.params.demoter, demotedTx.demoter); - assert.bigIntEquals(event.params.amt, demotedTx.amt); - assert.bigIntEquals(event.params.tokenId, demotedTx.tokenId); + const demotionTx = DemotionTx.load(id); + assert.assertNotNull(demotionTx); + if (!demotionTx) return; + assert.bytesEquals(event.params.demoter, demotionTx.demoter); + assert.bigIntEquals(event.params.amt, demotionTx.amt); + assert.bigIntEquals(event.params.tokenId, demotionTx.tokenId); }; export const expectInitializedAdded = (event: Initialized): void => { @@ -79,48 +79,48 @@ export const expectInitializedAdded = (event: Initialized): void => { assert.i32Equals(event.params.version, initializedTx.version); }; -export const expectPromotedAdded = (event: Promoted): void => { +export const expectPromotionAdded = (event: Promotion): void => { const id = createId(event.transaction.hash, event.transactionLogIndex); - const promotedTx = PromotedTx.load(id); - assert.assertNotNull(promotedTx); - if (!promotedTx) return; - assert.bytesEquals(event.params.promoter, promotedTx.promoter); - assert.bigIntEquals(event.params.amt, promotedTx.amt); - assert.bigIntEquals(event.params.tokenId, promotedTx.tokenId); + const promotionTx = PromotionTx.load(id); + assert.assertNotNull(promotionTx); + if (!promotionTx) return; + assert.bytesEquals(event.params.promoter, promotionTx.promoter); + assert.bigIntEquals(event.params.amt, promotionTx.amt); + assert.bigIntEquals(event.params.tokenId, promotionTx.tokenId); }; -export const expectProposalApprovedAdded = (event: ProposalApproved): void => { +export const expectApprovedProposalAdded = (event: ApprovedProposal): void => { const id = createId(event.transaction.hash, event.transactionLogIndex); - const proposalApprovedTx = ProposalApprovedTx.load(id); - assert.assertNotNull(proposalApprovedTx); - if (!proposalApprovedTx) return; - assert.bigIntEquals(event.params.proposalId, proposalApprovedTx.proposalId); - assert.bigIntEquals(event.params.tokenId, proposalApprovedTx.tokenId); - assert.bigIntEquals(event.params.approvals, proposalApprovedTx.approvals); + const approvedProposalTx = ApprovedProposalTx.load(id); + assert.assertNotNull(approvedProposalTx); + if (!approvedProposalTx) return; + assert.bigIntEquals(event.params.proposalId, approvedProposalTx.proposalId); + assert.bigIntEquals(event.params.tokenId, approvedProposalTx.tokenId); + assert.bigIntEquals(event.params.approvals, approvedProposalTx.approvals); }; -export const expectProposalCreatedAdded = (event: ProposalCreated): void => { +export const expectCreatedProposalAdded = (event: CreatedProposal): void => { const id = createId(event.transaction.hash, event.transactionLogIndex); - const proposalCreatedTx = ProposalCreatedTx.load(id); - assert.assertNotNull(proposalCreatedTx); - if (!proposalCreatedTx) return; - assert.bytesEquals(changetype
(event.params.target), changetype
(proposalCreatedTx.target)); + const createdProposalTx = CreatedProposalTx.load(id); + assert.assertNotNull(createdProposalTx); + if (!createdProposalTx) return; + assert.bytesEquals(changetype
(event.params.target), changetype
(createdProposalTx.target)); }; -export const expectProposalExecutedAdded = (event: ProposalExecuted): void => { +export const expectExecutedProposalAdded = (event: ExecutedProposal): void => { const id = createId(event.transaction.hash, event.transactionLogIndex); - const proposalExecutedTx = ProposalExecutedTx.load(id); - assert.assertNotNull(proposalExecutedTx); - if (!proposalExecutedTx) return; - assert.bigIntEquals(event.params.proposalId, proposalExecutedTx.proposalId); + const executedProposalTx = ExecutedProposalTx.load(id); + assert.assertNotNull(executedProposalTx); + if (!executedProposalTx) return; + assert.bigIntEquals(event.params.proposalId, executedProposalTx.proposalId); }; -export const expectProposalCanceledAdded = (event: ProposalCanceled): void => { +export const expectCanceledProposalAdded = (event: CanceledProposal): void => { const id = createId(event.transaction.hash, event.transactionLogIndex); - const proposalCanceledTx = ProposalCanceledTx.load(id); - assert.assertNotNull(proposalCanceledTx); - if (!proposalCanceledTx) return; - assert.bigIntEquals(event.params.proposalId, proposalCanceledTx.proposalId); + const canceledProposalTx = CanceledProposalTx.load(id); + assert.assertNotNull(canceledProposalTx); + if (!canceledProposalTx) return; + assert.bigIntEquals(event.params.proposalId, canceledProposalTx.proposalId); }; export const expectReceivedEtherAdded = (event: ReceivedEther): void => { diff --git a/subgraphs/chamber/tests/helpers/utils.ts b/subgraphs/chamber/tests/helpers/utils.ts index e935818..2bbf368 100644 --- a/subgraphs/chamber/tests/helpers/utils.ts +++ b/subgraphs/chamber/tests/helpers/utils.ts @@ -5,13 +5,13 @@ import { ChamberDeployed, OwnershipTransferred } from "../../generated/Registry/ import { ChangedGuard, - Demoted, + Demotion, Initialized, - Promoted, - ProposalApproved, - ProposalCreated, - ProposalExecuted, - ProposalCanceled, + Promotion, + ApprovedProposal, + CreatedProposal, + ExecutedProposal, + CanceledProposal, ReceivedEther, ReceivedFallback, } from "../../generated/templates/Chamber/Chamber"; @@ -81,9 +81,9 @@ export function createChangedGuardEvent(guard: string): ChangedGuard { return changedGuardEvent; } -export function createDemotedEvent(demoter: string, amt: i32, tokenId: i32): Demoted { +export function createDemotionEvent(demoter: string, amt: i32, tokenId: i32): Demotion { const mockEvent = newMockEvent(); - const demotedEvent = new Demoted( + const demotionEvent = new Demotion( mockEvent.address, mockEvent.logIndex, mockEvent.transactionLogIndex, @@ -93,10 +93,10 @@ export function createDemotedEvent(demoter: string, amt: i32, tokenId: i32): Dem [], mockEvent.receipt ); - demotedEvent.parameters.push(addressEventParam("demoter", demoter)); - demotedEvent.parameters.push(uintEventParam("amt", amt)); - demotedEvent.parameters.push(uintEventParam("tokenId", tokenId)); - return demotedEvent; + demotionEvent.parameters.push(addressEventParam("demoter", demoter)); + demotionEvent.parameters.push(uintEventParam("amt", amt)); + demotionEvent.parameters.push(uintEventParam("tokenId", tokenId)); + return demotionEvent; } export function createInitializedEvent(version: i32): Initialized { @@ -115,9 +115,9 @@ export function createInitializedEvent(version: i32): Initialized { return initializedEvent; } -export function createPromotedEvent(promoter: string, amt: i32, tokenId: i32): Promoted { +export function createPromotionEvent(promoter: string, amt: i32, tokenId: i32): Promotion { const mockEvent = newMockEvent(); - const promotedEvent = new Promoted( + const promotionEvent = new Promotion( mockEvent.address, mockEvent.logIndex, mockEvent.transactionLogIndex, @@ -127,15 +127,15 @@ export function createPromotedEvent(promoter: string, amt: i32, tokenId: i32): P [], mockEvent.receipt ); - promotedEvent.parameters.push(addressEventParam("demoter", promoter)); - promotedEvent.parameters.push(uintEventParam("amt", amt)); - promotedEvent.parameters.push(uintEventParam("tokenId", tokenId)); - return promotedEvent; + promotionEvent.parameters.push(addressEventParam("demoter", promoter)); + promotionEvent.parameters.push(uintEventParam("amt", amt)); + promotionEvent.parameters.push(uintEventParam("tokenId", tokenId)); + return promotionEvent; } -export function createProposalApprovedEvent(proposalId: i32, tokenId: i32, approvals: i32): ProposalApproved { +export function createApprovedProposalEvent(proposalId: i32, tokenId: i32, approvals: i32): ApprovedProposal { const mockEvent = newMockEvent(); - const proposalApprovedEvent = new ProposalApproved( + const approvedProposalEvent = new ApprovedProposal( mockEvent.address, mockEvent.logIndex, mockEvent.transactionLogIndex, @@ -145,22 +145,22 @@ export function createProposalApprovedEvent(proposalId: i32, tokenId: i32, appro [], mockEvent.receipt ); - proposalApprovedEvent.parameters.push(uintEventParam("proposalId", proposalId)); - proposalApprovedEvent.parameters.push(uintEventParam("tokenId", tokenId)); - proposalApprovedEvent.parameters.push(uintEventParam("approvals", approvals)); - return proposalApprovedEvent; + approvedProposalEvent.parameters.push(uintEventParam("proposalId", proposalId)); + approvedProposalEvent.parameters.push(uintEventParam("tokenId", tokenId)); + approvedProposalEvent.parameters.push(uintEventParam("approvals", approvals)); + return approvedProposalEvent; } -export function createProposalCreatedEvent( +export function createCreatedProposalEvent( proposalId: i32, target: string[], value: i32[], data: string[], voters: i32[], nonce: i32 -): ProposalCreated { +): CreatedProposal { const mockEvent = newMockEvent(); - const proposalCreatedEvent = new ProposalCreated( + const createdProposalEvent = new CreatedProposal( mockEvent.address, mockEvent.logIndex, mockEvent.transactionLogIndex, @@ -170,20 +170,20 @@ export function createProposalCreatedEvent( [], mockEvent.receipt ); - proposalCreatedEvent.parameters.push(uintEventParam("proposalId", proposalId)); - proposalCreatedEvent.parameters.push( + createdProposalEvent.parameters.push(uintEventParam("proposalId", proposalId)); + createdProposalEvent.parameters.push( new ethereum.EventParam("target", ethereum.Value.fromAddressArray(changetype(target))) ); - proposalCreatedEvent.parameters.push(new ethereum.EventParam("value", ethereum.Value.fromI32Array(value))); - proposalCreatedEvent.parameters.push(new ethereum.EventParam("data", ethereum.Value.fromStringArray(data))); - proposalCreatedEvent.parameters.push(new ethereum.EventParam("voters", ethereum.Value.fromI32Array(voters))); - proposalCreatedEvent.parameters.push(uintEventParam("nonce", nonce)); - return proposalCreatedEvent; + createdProposalEvent.parameters.push(new ethereum.EventParam("value", ethereum.Value.fromI32Array(value))); + createdProposalEvent.parameters.push(new ethereum.EventParam("data", ethereum.Value.fromStringArray(data))); + createdProposalEvent.parameters.push(new ethereum.EventParam("voters", ethereum.Value.fromI32Array(voters))); + createdProposalEvent.parameters.push(uintEventParam("nonce", nonce)); + return createdProposalEvent; } -export function createProposalExecutedEvent(proposalId: i32): ProposalExecuted { +export function createExecutedProposalEvent(proposalId: i32): ExecutedProposal { const mockEvent = newMockEvent(); - const proposalExecutedEvent = new ProposalExecuted( + const executedProposalEvent = new ExecutedProposal( mockEvent.address, mockEvent.logIndex, mockEvent.transactionLogIndex, @@ -193,13 +193,13 @@ export function createProposalExecutedEvent(proposalId: i32): ProposalExecuted { [], mockEvent.receipt ); - proposalExecutedEvent.parameters.push(uintEventParam("proposalId", proposalId)); - return proposalExecutedEvent; + executedProposalEvent.parameters.push(uintEventParam("proposalId", proposalId)); + return executedProposalEvent; } -export function createProposalCanceledEvent(proposalId: i32): ProposalCanceled { +export function createCanceledProposalEvent(proposalId: i32): CanceledProposal { const mockEvent = newMockEvent(); - const proposalCanceledEvent = new ProposalCanceled( + const canceledProposalEvent = new CanceledProposal( mockEvent.address, mockEvent.logIndex, mockEvent.transactionLogIndex, @@ -209,8 +209,8 @@ export function createProposalCanceledEvent(proposalId: i32): ProposalCanceled { [], mockEvent.receipt ); - proposalCanceledEvent.parameters.push(uintEventParam("proposalId", proposalId)); - return proposalCanceledEvent; + canceledProposalEvent.parameters.push(uintEventParam("proposalId", proposalId)); + return canceledProposalEvent; } export function createReceivedEtherEvent(sender: string, value: i32): ReceivedEther {