Merge pull request #145 from dedis/fix-id-decode

nkcr · web-flow · commit 2a34c49c62ef · 2022-06-21T15:16:01.000+02:00
Use the decoded ID of questions to unmarshal ballot
diff --git a/contracts/evoting/types/ballots.go b/contracts/evoting/types/ballots.go
@@ -68,11 +68,10 @@ func (b *Ballot) Unmarshal(marshalledBallot string, election Election) error {
 			return xerrors.Errorf("a line in the ballot has length != 3: %s", line)
 		}
 
-		_, err := base64.StdEncoding.DecodeString(question[1])
+		questionID, err := base64.StdEncoding.DecodeString(question[1])
 		if err != nil {
 			return xerrors.Errorf("could not decode question ID: %v", err)
 		}
-		questionID := question[1]
 
 		q := election.Configuration.GetQuestion(ID(questionID))
 

Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,10 @@ func (b *Ballot) Unmarshal(marshalledBallot string, election Election) error {`
`68`	`68`	`return xerrors.Errorf("a line in the ballot has length != 3: %s", line)`
`69`	`69`	`}`
`70`	`70`
`71`		`- _, err := base64.StdEncoding.DecodeString(question[1])`
	`71`	`+ questionID, err := base64.StdEncoding.DecodeString(question[1])`
`72`	`72`	`if err != nil {`
`73`	`73`	`return xerrors.Errorf("could not decode question ID: %v", err)`
`74`	`74`	`}`
`75`		`- questionID := question[1]`
`76`	`75`
`77`	`76`	`q := election.Configuration.GetQuestion(ID(questionID))`
`78`	`77`