From 84f621707ff981036c32036c2cda238c5d939b9b Mon Sep 17 00:00:00 2001 From: ap-pauloafonso Date: Sun, 14 Mar 2021 23:58:06 -0300 Subject: [PATCH] cleanup --- internal/emulation/emulation.go | 6 +++--- internal/generator/key.go | 2 +- internal/generator/key_test.go | 14 ++++++++++++++ internal/generator/peerId.go | 2 +- internal/generator/rouding.go | 2 +- internal/generator/rounding_test.go | 2 +- 6 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 internal/generator/key_test.go diff --git a/internal/emulation/emulation.go b/internal/emulation/emulation.go index 0ba46b0..fa1d482 100644 --- a/internal/emulation/emulation.go +++ b/internal/emulation/emulation.go @@ -52,17 +52,17 @@ func NewEmulation(code string) (*Emulation, error) { return nil, err } - peerG, err := generator.NewRegexPeerIdGenerator(c.PeerID.Generator, c.PeerID.Regex) + peerG, err := generator.NewRegexPeerIdGenerator(c.PeerID.Regex) if err != nil { return nil, err } - keyG, err := generator.NewDefaultKeyGenerator(c.Key.Generator) + keyG, err := generator.NewDefaultKeyGenerator() if err != nil { return nil, err } - roudingG, err := generator.NewDefaultRoudingGenerator(c.Rounding.Generator) + roudingG, err := generator.NewDefaultRoudingGenerator() if err != nil { return nil, err } diff --git a/internal/generator/key.go b/internal/generator/key.go index abe68b4..50eccfc 100644 --- a/internal/generator/key.go +++ b/internal/generator/key.go @@ -6,7 +6,7 @@ import ( "strings" ) -func NewDefaultKeyGenerator(generatorCode string) (*DefaultKeyGenerator, error) { +func NewDefaultKeyGenerator() (*DefaultKeyGenerator, error) { randomBytes := make([]byte, 4) rand.Read(randomBytes) str := hex.EncodeToString(randomBytes) diff --git a/internal/generator/key_test.go b/internal/generator/key_test.go new file mode 100644 index 0000000..8aeb957 --- /dev/null +++ b/internal/generator/key_test.go @@ -0,0 +1,14 @@ +package generator + +import "testing" + +func TestDeaultKeyGenerator(t *testing.T) { + t.Run("Key has 8 length", func(t *testing.T) { + obj, _ := NewDefaultKeyGenerator() + key := obj.Key() + if len(key) != 8 { + t.Error("Keys must have length of 8") + } + + }) +} diff --git a/internal/generator/peerId.go b/internal/generator/peerId.go index ff45ec1..9e329ed 100644 --- a/internal/generator/peerId.go +++ b/internal/generator/peerId.go @@ -8,7 +8,7 @@ type RegexPeerIdGenerator struct { generated string } -func NewRegexPeerIdGenerator(generatorCode, pattern string) (*RegexPeerIdGenerator, error) { +func NewRegexPeerIdGenerator(pattern string) (*RegexPeerIdGenerator, error) { result, err := regen.Generate(pattern) if err != nil { return nil, err diff --git a/internal/generator/rouding.go b/internal/generator/rouding.go index df0def8..3311001 100644 --- a/internal/generator/rouding.go +++ b/internal/generator/rouding.go @@ -2,7 +2,7 @@ package generator type DefaultRoundingGenerator struct{} -func NewDefaultRoudingGenerator(code string) (*DefaultRoundingGenerator, error) { +func NewDefaultRoudingGenerator() (*DefaultRoundingGenerator, error) { return &DefaultRoundingGenerator{}, nil } diff --git a/internal/generator/rounding_test.go b/internal/generator/rounding_test.go index a07a6eb..8ccb81b 100644 --- a/internal/generator/rounding_test.go +++ b/internal/generator/rounding_test.go @@ -3,7 +3,7 @@ package generator import "testing" func TestNextAmountReport(t *testing.T) { - r, _ := NewDefaultRoudingGenerator("") + r, _ := NewDefaultRoudingGenerator() d, u, l := r.Round(656497856, 46479878, 7879879, 1024) //same