From 18063513d23dced71af2389efa0691893b44f074 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Tue, 12 Apr 2022 20:45:02 +0000
Subject: [PATCH] Move proto user struct into user struct
---
interfaces/user/proto.go | 29 -----------------------------
interfaces/user/user.go | 22 ++++++++++++++++++++++
2 files changed, 22 insertions(+), 29 deletions(-)
delete mode 100644 interfaces/user/proto.go
diff --git a/interfaces/user/proto.go b/interfaces/user/proto.go
deleted file mode 100644
index 657c2e714..000000000
--- 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 0e3c6ca03..da2569d90 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
--
GitLab