diff --git a/interfaces/user/proto.go b/interfaces/user/proto.go deleted file mode 100644 index 657c2e714d70f06b88c6d0866ec2bbca5015f24e..0000000000000000000000000000000000000000 --- a/interfaces/user/proto.go +++ /dev/null @@ -1,29 +0,0 @@ -package user - -import ( - "gitlab.com/elixxir/crypto/cyclic" - "gitlab.com/xx_network/crypto/signature/rsa" - "gitlab.com/xx_network/primitives/id" -) - -type Proto struct { - //General Identity - TransmissionID *id.ID - TransmissionSalt []byte - TransmissionRSA *rsa.PrivateKey - ReceptionID *id.ID - ReceptionSalt []byte - ReceptionRSA *rsa.PrivateKey - Precanned bool - // Timestamp in which user has registered with the network - RegistrationTimestamp int64 - - RegCode string - - TransmissionRegValidationSig []byte - ReceptionRegValidationSig []byte - - //e2e Identity - E2eDhPrivateKey *cyclic.Int - E2eDhPublicKey *cyclic.Int -} diff --git a/interfaces/user/user.go b/interfaces/user/user.go index 0e3c6ca0331756882b38ce9706c1ffdbbcf65e96..da2569d90d2d5717338588532fcadf8dd391f087 100644 --- a/interfaces/user/user.go +++ b/interfaces/user/user.go @@ -16,6 +16,28 @@ import ( "gitlab.com/xx_network/primitives/id" ) +type Proto struct { + //General Identity + TransmissionID *id.ID + TransmissionSalt []byte + TransmissionRSA *rsa.PrivateKey + ReceptionID *id.ID + ReceptionSalt []byte + ReceptionRSA *rsa.PrivateKey + Precanned bool + // Timestamp in which user has registered with the network + RegistrationTimestamp int64 + + RegCode string + + TransmissionRegValidationSig []byte + ReceptionRegValidationSig []byte + + //e2e Identity + E2eDhPrivateKey *cyclic.Int + E2eDhPublicKey *cyclic.Int +} + type Info struct { //General Identity TransmissionID *id.ID