From 52beafb474a57f688d0b856c36bed958b134bf40 Mon Sep 17 00:00:00 2001
From: benjamin <ben@elixxir.io>
Date: Sun, 23 Oct 2022 21:38:33 -0700
Subject: [PATCH] fixed dummy messages
---
dummy/mockCmix_test.go | 3 +--
dummy/random.go | 9 ++-------
dummy/random_test.go | 20 ++++++++++----------
3 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/dummy/mockCmix_test.go b/dummy/mockCmix_test.go
index 96bab8338..2aca679d0 100644
--- a/dummy/mockCmix_test.go
+++ b/dummy/mockCmix_test.go
@@ -78,8 +78,7 @@ func (m mockCmix) Follow(report cmix.ClientErrorReport) (stoppable.Stoppable, er
}
func (m mockCmix) GetMaxMessageLength() int {
- //TODO implement me
- panic("implement me")
+ return 100
}
func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, p cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) {
diff --git a/dummy/random.go b/dummy/random.go
index 2a41d8243..2f1abc73e 100644
--- a/dummy/random.go
+++ b/dummy/random.go
@@ -49,7 +49,7 @@ func (m *Manager) newRandomCmixMessage(rng csprng.Source) (
}
// Generate random message payload
- payloadSize := m.store.GetCmixGroup().GetP().ByteLen()
+ payloadSize := m.net.GetMaxMessageLength()
payload, err = newRandomPayload(payloadSize, rng)
if err != nil {
return nil, format.Fingerprint{}, message.Service{}, nil, nil,
@@ -79,13 +79,8 @@ func (m *Manager) newRandomCmixMessage(rng csprng.Source) (
// newRandomPayload generates a random payload of a random length
// within the maxPayloadSize.
func newRandomPayload(maxPayloadSize int, rng csprng.Source) ([]byte, error) {
- // Generate random payload size
- randomPayloadSize, err := randomInt(maxPayloadSize, rng)
- if err != nil {
- return nil, errors.Errorf(payloadSizeRngErr, err)
- }
- randomMsg, err := csprng.Generate(randomPayloadSize, rng)
+ randomMsg, err := csprng.Generate(maxPayloadSize, rng)
if err != nil {
return nil, err
}
diff --git a/dummy/random_test.go b/dummy/random_test.go
index fab84c22f..a4336983d 100644
--- a/dummy/random_test.go
+++ b/dummy/random_test.go
@@ -75,16 +75,16 @@ func Test_durationRng_Consistency(t *testing.T) {
// when using a PRNG and that the result is not larger than the max payload.
func Test_newRandomPayload_Consistency(t *testing.T) {
expectedPayloads := []string{
- "l7ufS7Ry6J9bFITyUgnJ",
- "Ut/Xm012Qpthegyfnw07pVsMwNYUTIiFNQ==",
- "CD9h",
- "GSnh",
- "joE=",
- "uoQ+6NY+jE/+HOvqVG2PrBPdGqwEzi6ih3xVec+ix44bC6+uiBuCpw==",
- "qkNGWnhiBhaXiu0M48bE8657w+BJW1cS/v2+DBAoh+EA2s0tiF9pLLYH2gChHBxwcec=",
- "suEpcF4nPwXJIyaCjisFbg==",
- "R/3zREEO1MEWAj+o41drb+0n/4l0usDK/ZrQVpKxNhnnOJZN/ceejVNDc2Yc/WbXTw==",
- "bkt1IQ==",
+ "U4x/lrFkvxuXu59LtHLon1sUhPJSCcnZND6SugndnVLf15tNdkKbYXoMn58NO6VbDMDWFEyIhTWEGsvgcJsHWA==",
+ "CD9h03W8ArQd9PkZKeGP2p5vguVOdI6B555LvW/jTNy6hD7o1j6MT/4c6+pUbY+sE90arATOLqKHfFV5z6LHjg==",
+ "GwuvrogbgqdREIpC7TyQPKpDRlp4YgYWl4rtDOPGxPOue8PgSVtXEv79vgwQKIfhANrNLYhfaSy2B9oAoRwccA==",
+ "ceeWotwtwlpbdLLhKXBeJz8FySMmgo4rBW44F2WOEGFJiUf980RBDtTBFgI/qONXa2/tJ/+JdLrAyv2a0FaSsQ==",
+ "NhnnOJZN/ceejVNDc2Yc/WbXT+weG4lJGrcjbkt1IWKQzyvrQsPKJzKFYPGqwGfOpui/RtSrK0aAQCxfsoIOiA==",
+ "XTJg8d6XgoPUoJo2+WwglBdG4+1NpkaprotPp7T8OiC6+hp17TJ6hriww5rxz9KztRIZ6nlTOr9EjSxHnTJgdQ==",
+ "M5BZFMjMHPCdo54Okp0CSry8sWk5e7c05+8KbgHxhU3rX+Qk/vesIQiR9ZdeKSqiuKoEfGHNszNz6+csJ6CYwA==",
+ "IZfa5rcyw1HfZo+HTiyfHOCcqGAX5+IXSDA/9BwbI+EcSO0XU51oX3byp5i8ZN4OXbKGSyrTwmzmOCNCdloT1g==",
+ "luUt92D2w0ZeKaDcpGrDoNVwEzvCFXH19UpkMQVRP9hCmxlK4bqfKoOGrnKzZh/oLCrGTb9GFRgk4jBTEmN8mQ==",
+ "wrh9bfDdXvKDZxkHLWcvYfqgvob0V5Iew3wORgzw1wPQfcX1ZhpFATNAmnEramar17plIkyiaXjZpc5i/rEagw==",
}
prng := NewPrng(42)
--
GitLab