Rename Exercice's Keys as Flags

This commit is contained in:
nemunaire 2018-09-24 10:00:17 +02:00 committed by Pierre-Olivier Mercier
commit d21f3b0b83
18 changed files with 252 additions and 252 deletions

View file

@ -32,7 +32,7 @@ type myTeamExercice struct {
Hints []myTeamHint `json:"hints,omitempty"`
Gain int `json:"gain"`
Files []myTeamFile `json:"files,omitempty"`
Keys []string `json:"keys,omitempty"`
Flags []string `json:"keys,omitempty"`
SolvedMat []bool `json:"solved_matrix,omitempty"`
MCQs []myTeamMCQ `json:"mcqs,omitempty"`
SolveDist int64 `json:"solve_dist,omitempty"`
@ -157,18 +157,18 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
}
}
// Expose exercice keys
// Expose exercice flags
exercice.Keys = []string{}
exercice.Flags = []string{}
if keys, err := e.GetKeys(); err != nil {
if flags, err := e.GetFlags(); err != nil {
return nil, err
} else {
for _, k := range keys {
for _, k := range flags {
if t == nil {
exercice.Keys = append(exercice.Keys, fmt.Sprintf("%x", k.Checksum)+k.Label)
exercice.Flags = append(exercice.Flags, fmt.Sprintf("%x", k.Checksum)+k.Label)
} else {
exercice.Keys = append(exercice.Keys, k.Label)
exercice.Flags = append(exercice.Flags, k.Label)
if PartialValidation {
exercice.SolvedMat = append(exercice.SolvedMat, t.HasPartiallySolved(k) != nil)
}