diff --git a/CPSCore/src/main/java/community/icon/cps/score/cpscore/db/ProposalDataDb.java b/CPSCore/src/main/java/community/icon/cps/score/cpscore/db/ProposalDataDb.java index b54986ec..db35181c 100644 --- a/CPSCore/src/main/java/community/icon/cps/score/cpscore/db/ProposalDataDb.java +++ b/CPSCore/src/main/java/community/icon/cps/score/cpscore/db/ProposalDataDb.java @@ -65,12 +65,6 @@ public static void addDataToProposalDB(ProposalAttributes proposalData, String p } public static Map getDataFromProposalDB(String prefix) { - String reason = sponsorVoteReason.at(prefix).getOrDefault(""); - if (reason.equalsIgnoreCase("none")) { - reason = ""; - } else { - reason = reason.toString(); - } Map entryMap = Map.ofEntries( Map.entry(IPFS_HASH, ipfsHash.at(prefix).getOrDefault("")), @@ -97,8 +91,7 @@ public static Map getDataFromProposalDB(String prefix) { Map.entry(REJECT_VOTERS, rejectVoters.at(prefix).size()), Map.entry(ABSTAIN_VOTERS, abstainVoters.at(prefix).size()), Map.entry(BUDGET_ADJUSTMENT, budgetAdjustment.at(prefix).getOrDefault(false)), - Map.entry(SUBMIT_PROGRESS_REPORT, submitProgressReport.at(prefix).getOrDefault(false)), - Map.entry(SPONSOR_VOTE_REASON,reason)); + Map.entry(SUBMIT_PROGRESS_REPORT, submitProgressReport.at(prefix).getOrDefault(false))); return entryMap; } diff --git a/CPSCore/src/test/java/community/icon/cps/score/cpscore/CPSScoreTest.java b/CPSCore/src/test/java/community/icon/cps/score/cpscore/CPSScoreTest.java index 0a1d07cd..2c7b4213 100644 --- a/CPSCore/src/test/java/community/icon/cps/score/cpscore/CPSScoreTest.java +++ b/CPSCore/src/test/java/community/icon/cps/score/cpscore/CPSScoreTest.java @@ -364,6 +364,8 @@ void submitProposal(){ submitProposalMethod(); Map proposalDetails = (Map) cpsScore.call("getProposalDetailsByHash", "Proposal 1"); System.out.println(proposalDetails); + proposalDetails.remove("sponsor_vote_reason"); + System.out.println(proposalDetails); assertEquals("Proposal 1", proposalDetails.get("ipfs_hash")); assertEquals("Title", proposalDetails.get("project_title")); assertEquals(2, proposalDetails.get("project_duration")); @@ -784,6 +786,7 @@ void rejectProposal(){ updatePeriods(); Map proposalDetails = getProposalDetailsByHash("Proposal 1"); + proposalDetails.remove("sponsor_vote_reason"); assertEquals(REJECTED, proposalDetails.get("status")); Map claimableSponsorBond = (Map) cpsScore.call("checkClaimableSponsorBond", testingAccount.getAddress()); @@ -1064,6 +1067,7 @@ void voteProgressReportAfterSubmittingProposalWithoutBudgetAdjustment(){ updatePeriods(); Map proposalDetails = (Map) cpsScore.call("getProposalDetailsByHash", "Proposal 1"); + proposalDetails.remove("sponsor_vote_reason"); assertEquals(COMPLETED, proposalDetails.get("status")); Map sponsorsRecord = (Map) cpsScore.call("getSponsorsRecord"); @@ -1255,6 +1259,7 @@ void disqualifyProposal(){ updateNextBlock(); cpsScore.invoke(owner, "update_period"); proposalDetails = getProposalDetailsByHash("Proposal 1"); + proposalDetails.remove("sponsor_vote_reason"); assertEquals(DISQUALIFIED, proposalDetails.get(STATUS)); assertEquals(BOND_CANCELLED, proposalDetails.get(SPONSOR_DEPOSIT_STATUS));