Trapping for failed collective proposals (#4885)
* Trapping for failed collective proposals * revert multi * Recomment * Remove multi augmentation * Adjust
This commit is contained in:
@@ -156,6 +156,6 @@ describe('bounties derive', () => {
|
||||
expect(result).toHaveLength(2);
|
||||
expect(result[0].proposals).toHaveLength(0);
|
||||
expect(result[1].proposals).toHaveLength(1);
|
||||
expect(result[1].proposals[0].proposal.method).toEqual('approveBounty');
|
||||
expect(result[1].proposals[0].proposal && result[1].proposals[0].proposal.method).toEqual('approveBounty');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -23,7 +23,9 @@ function parseResult ([maybeBounties, maybeDescriptions, ids, bountyProposals]:
|
||||
bounty: bounty.unwrap(),
|
||||
description: maybeDescriptions[index].unwrapOrDefault().toUtf8(),
|
||||
index: ids[index],
|
||||
proposals: bountyProposals.filter((bountyProposal) => ids[index].eq(bountyProposal.proposal.args[0]))
|
||||
proposals: bountyProposals.filter((bountyProposal) =>
|
||||
bountyProposal.proposal && ids[index].eq(bountyProposal.proposal.args[0])
|
||||
)
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -7,5 +7,7 @@ export function filterBountiesProposals (api: DeriveApi, allProposals: DeriveCol
|
||||
const bountyTxBase = api.tx.bounties ? api.tx.bounties : api.tx.treasury;
|
||||
const bountyProposalCalls = [bountyTxBase.approveBounty, bountyTxBase.closeBounty, bountyTxBase.proposeCurator, bountyTxBase.unassignCurator];
|
||||
|
||||
return allProposals.filter((proposal) => bountyProposalCalls.find((bountyCall) => bountyCall.is(proposal.proposal)));
|
||||
return allProposals.filter((proposal) => bountyProposalCalls.find((bountyCall) =>
|
||||
proposal.proposal && bountyCall.is(proposal.proposal))
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user