forked from dedis/d-voting
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR separates the ballots from the forms. This allows to run adding a new ballot much faster. When there are more than 100 ballots, this gets very important: adding a 1000th ballot can take 1s, a 10'000th ballot 10s. Using this PR, up to the 10'000th ballot it only takes 100ms.
- Loading branch information
Showing
18 changed files
with
462 additions
and
187 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| package json | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
|
|
||
| "github.com/c4dt/d-voting/contracts/evoting/types" | ||
| "go.dedis.ch/dela/serde" | ||
| "golang.org/x/xerrors" | ||
| ) | ||
|
|
||
| type suffragiaFormat struct{} | ||
|
|
||
| func (suffragiaFormat) Encode(ctx serde.Context, msg serde.Message) ([]byte, error) { | ||
| switch m := msg.(type) { | ||
| case types.Suffragia: | ||
| sJson, err := encodeSuffragia(ctx, m) | ||
| if err != nil { | ||
| return nil, xerrors.Errorf("couldn't encode suffragia: %v", err) | ||
| } | ||
|
|
||
| buff, err := ctx.Marshal(&sJson) | ||
| if err != nil { | ||
| return nil, xerrors.Errorf("failed to marshal form: %v", err) | ||
| } | ||
|
|
||
| return buff, nil | ||
| default: | ||
| return nil, xerrors.Errorf("Unknown format: %T", msg) | ||
| } | ||
| } | ||
|
|
||
| func (suffragiaFormat) Decode(ctx serde.Context, data []byte) (serde.Message, error) { | ||
| var sJson SuffragiaJSON | ||
|
|
||
| err := ctx.Unmarshal(data, &sJson) | ||
| if err != nil { | ||
| return nil, xerrors.Errorf("failed to unmarshal form: %v", err) | ||
| } | ||
|
|
||
| return decodeSuffragia(ctx, sJson) | ||
| } | ||
|
|
||
| // SuffragiaJSON defines the JSON representation of a suffragia. | ||
| type SuffragiaJSON struct { | ||
| UserIDs []string | ||
| Ciphervotes []json.RawMessage | ||
| } | ||
|
|
||
| func encodeSuffragia(ctx serde.Context, suffragia types.Suffragia) (SuffragiaJSON, error) { | ||
| ciphervotes := make([]json.RawMessage, len(suffragia.Ciphervotes)) | ||
|
|
||
| for i, ciphervote := range suffragia.Ciphervotes { | ||
| buff, err := ciphervote.Serialize(ctx) | ||
| if err != nil { | ||
| return SuffragiaJSON{}, xerrors.Errorf("failed to serialize ciphervote: %v", err) | ||
| } | ||
|
|
||
| ciphervotes[i] = buff | ||
| } | ||
| return SuffragiaJSON{ | ||
| UserIDs: suffragia.UserIDs, | ||
| Ciphervotes: ciphervotes, | ||
| }, nil | ||
| } | ||
|
|
||
| func decodeSuffragia(ctx serde.Context, suffragiaJSON SuffragiaJSON) (types.Suffragia, error) { | ||
| var res types.Suffragia | ||
| fac := ctx.GetFactory(types.CiphervoteKey{}) | ||
|
|
||
| factory, ok := fac.(types.CiphervoteFactory) | ||
| if !ok { | ||
| return res, xerrors.Errorf("invalid ciphervote factory: '%T'", fac) | ||
| } | ||
|
|
||
| ciphervotes := make([]types.Ciphervote, len(suffragiaJSON.Ciphervotes)) | ||
|
|
||
| for i, ciphervoteJSON := range suffragiaJSON.Ciphervotes { | ||
| msg, err := factory.Deserialize(ctx, ciphervoteJSON) | ||
| if err != nil { | ||
| return res, xerrors.Errorf("failed to deserialize ciphervote json: %v", err) | ||
| } | ||
|
|
||
| ciphervote, ok := msg.(types.Ciphervote) | ||
| if !ok { | ||
| return res, xerrors.Errorf("wrong type: '%T'", msg) | ||
| } | ||
|
|
||
| ciphervotes[i] = ciphervote | ||
| } | ||
|
|
||
| res = types.Suffragia{ | ||
| UserIDs: suffragiaJSON.UserIDs, | ||
| Ciphervotes: ciphervotes, | ||
| } | ||
|
|
||
| return res, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.