Also adding AddPoints and ReconstructReply to the models.json

evoting/proto.go

@@ -0,0 +1,39 @@
+package evoting
+
+import (
+ "go.dedis.ch/cothority/v3/skipchain"
+ "go.dedis.ch/kyber/v3"
+)
+
+// PROTOSTART
+// package evoting_api;
+// type :skipchain.SkipBlockID:bytes
+// type :kyber.Point:bytes
+//
+// option java_package = "ch.epfl.dedis.lib.proto";
+// option java_outer_classname = "EvotingAPI";
+
+// Reconstruct message.
+type Reconstruct struct {
+ // ID of the election skipchain.
+ ID skipchain.SkipBlockID
+}
+
+// ReconstructReply message.
+type ReconstructReply struct {
+ // Points are the decrypted plaintexts.
+ Points []kyber.Point
+ // Eventual additional points - only if more than 9 candidates
+ AdditionalPoints []AddPoints
+}
+
+type AddPoints struct {
+ // The additional Points
+ AdditionalPoints []kyber.Point
+}
+
+// Ping message.
+type Ping struct {
+ // Nonce can be any integer.
+ Nonce uint32
+}

evoting/struct.go

@@ -1,12 +1,11 @@
 package evoting
 
 import (
+ "go.dedis.ch/cothority/v3/evoting/lib"
+ "go.dedis.ch/cothority/v3/skipchain"
  "go.dedis.ch/kyber/v3"
  "go.dedis.ch/onet/v3"
  "go.dedis.ch/onet/v3/network"
-
- "go.dedis.ch/cothority/v3/evoting/lib"
- "go.dedis.ch/cothority/v3/skipchain"
 )
 
 func init() {
@@ -152,23 +151,3 @@ type GetPartials struct {
 type GetPartialsReply struct {
  Partials []*lib.Partial // Partials from all conodes.
 }
-
-// Reconstruct message.
-type Reconstruct struct {
- ID skipchain.SkipBlockID // ID of the election skipchain.
-}
-
-// ReconstructReply message.
-type ReconstructReply struct {
- Points []kyber.Point // Points are the decrypted plaintexts.
- AdditionalPoints []AddPoints // Eventual additional points - only if more than 9 candidates
-}
-
-type AddPoints struct {
- AdditionalPoints []kyber.Point // The additional Points
-}
-
-// Ping message.
-type Ping struct {
- Nonce uint32 // Nonce can be any integer.
-}