remove succeeded attribute of Proposals; expand proposalExecuted testing

schema.graphql

@@ -808,7 +808,6 @@ type Proposal @entity {
   description: String! # proposal description hashed as part of proposalId
   distribution: DistributionPeriod # distributionPeriod in which the proposal was submitted if Standard, null otherwise
   executed: Boolean! # bool
-  successful: Boolean! # bool
   screeningVotesReceived: BigDecimal! # uint256
   fundingVotesReceived: BigDecimal! # uint256
   totalTokensRequested: BigDecimal! # uint256

src/grant-fund.ts

@@ -162,14 +162,8 @@ export function handleProposalCreated(event: ProposalCreatedEvent): void {
 
   // create Proposal entity
   const proposalId = bigIntToBytes(event.params.proposalId)
-  const proposal = new Proposal(proposalId) as Proposal
+  const proposal = loadOrCreateProposal(proposalId)
   proposal.description  = event.params.description
-  proposal.distribution = Bytes.empty()
-  proposal.executed     = false
-  proposal.successful   = false
-  proposal.screeningVotesReceived = ZERO_BD
-  proposal.fundingVotesReceived = ZERO_BD
-  proposal.params = []
 
   let totalTokensRequested = ZERO_BD
 
@@ -224,14 +218,11 @@ export function handleProposalExecuted(event: ProposalExecutedEvent): void {
   proposalExecuted.transactionHash = event.transaction.hash
 
   // update proposal entity
-  const proposal = Proposal.load(bigIntToBytes(event.params.proposalId)) as Proposal
-  if (proposal != null) {
-    proposal.executed = true
-    proposal.successful = true
+  const proposal = loadOrCreateProposal(bigIntToBytes(event.params.proposalId))
+  proposal.executed = true
 
-    // save entities to the store
-    proposal.save()
-  }
+  // save entities to the store
+  proposal.save()
   proposalExecuted.save()
 }
 

src/utils/grants/proposal.ts

@@ -19,7 +19,6 @@ export function loadOrCreateProposal(proposalId: Bytes): Proposal {
         proposal.description  = ""
         proposal.distribution = Bytes.empty()
         proposal.executed     = false
-        proposal.successful   = false
         proposal.screeningVotesReceived = ZERO_BD
         proposal.fundingVotesReceived = ZERO_BD
         proposal.totalTokensRequested = ZERO_BD

tests/grant-fund.test.ts

@@ -349,6 +349,28 @@ describe("Grant Fund assertions", () => {
 
     // check ProposalExecuted attributes
     assert.entityCount("ProposalExecuted", 1);
+
+    assert.fieldEquals(
+      "Proposal",
+      `${bigIntToBytes(proposalId).toHexString()}`,
+      "totalTokensRequested",
+      `${BigInt.fromI32(2)}`
+    );
+
+    assert.fieldEquals(
+      "Proposal",
+      `${bigIntToBytes(proposalId).toHexString()}`,
+      "executed",
+      `${true}`
+    );
+
+    assert.fieldEquals(
+      "ProposalExecuted",
+      `0xa16081f360e3847006db660bae1c6d1b2e17ec2a01000000`,
+      "proposalId",
+      `${proposalId}`
+    );
+
   });
 
   test("ScreeningVote", () => {
@@ -762,7 +784,7 @@ describe("Grant Fund assertions", () => {
     assert.entityCount("DistributionPeriod", 1);
     assert.entityCount("FundedSlate", 1);
 
-    logStore();
+    // logStore();
 
     // check FundedSlate attributes
     // assert.fieldEquals(