Skip to content

Commit a8f0452

Browse files
keltiakeltia
committed
gofmt pass.
1 parent f382136 commit a8f0452

File tree

7 files changed

+244
-255
lines changed

7 files changed

+244
-255
lines changed

‎cmd/cm-test/main.go

+44-44
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
package main
22

33
import (
4-
"github.com/keltia/cipher-machines"
5-
"fmt"
6-
"log"
4+
"fmt"
5+
"github.com/keltia/cipher-machines"
6+
"log"
77
)
88

99
const (
1010
// ABCDEFGHIJKLMNOPQRSTUVWXYZ
11-
rI = "EKMFLGDQVZNTOWYHX/USPAIBRCJ"
12-
rII = "AJDKS/IRUXBLHWTMCQGZNPYFVOE"
13-
rIII = "BDFHJLCPRTXVZNYEIWGAKM/USQO"
14-
rIV = "ESOVPZJAYQ/UIRHXLNFTGKDCMWB"
15-
rV = "VZBRGITYUPSDNHLXAWMJQOFECK/"
16-
rVI = "JPGVOUMFYQBENHZRDKASXLICTW/" // special, has notch in M too
11+
rI = "EKMFLGDQVZNTOWYHX/USPAIBRCJ"
12+
rII = "AJDKS/IRUXBLHWTMCQGZNPYFVOE"
13+
rIII = "BDFHJLCPRTXVZNYEIWGAKM/USQO"
14+
rIV = "ESOVPZJAYQ/UIRHXLNFTGKDCMWB"
15+
rV = "VZBRGITYUPSDNHLXAWMJQOFECK/"
16+
rVI = "JPGVOUMFYQBENHZRDKASXLICTW/" // special, has notch in M too
1717

18-
RfA = "EJMZALYXVBWFCRQUONTSPIKHGD"
19-
RfB = "YRUHQSLDPXNGOKMIEBFZCWVJAT"
20-
RfC = "FVPJIAOYEDRZXWGCTKUQSBNMHL"
18+
RfA = "EJMZALYXVBWFCRQUONTSPIKHGD"
19+
RfB = "YRUHQSLDPXNGOKMIEBFZCWVJAT"
20+
RfC = "FVPJIAOYEDRZXWGCTKUQSBNMHL"
2121

22-
PBS = "EJOYIVAQKWFXMTPSLUBD"
22+
PBS = "EJOYIVAQKWFXMTPSLUBD"
2323
)
2424

2525
var rotors = []string{
26-
rI,
26+
rI,
2727
rII,
2828
rIII,
2929
}
3030

3131
func testNewStep() {
32-
e, _ := machine.NewEnigma(3)
33-
err := e.Setup(rotors)
34-
if err != nil {
35-
log.Fatalf("Invalid Setup() with %#v", rotors)
36-
}
32+
e, _ := machine.NewEnigma(3)
33+
err := e.Setup(rotors)
34+
if err != nil {
35+
log.Fatalf("Invalid Setup() with %#v", rotors)
36+
}
3737

3838
fmt.Println("---- single step")
39-
e.SetRotorSettings([]int{0, 0, 20})
39+
e.SetRotorSettings([]int{0, 0, 20})
4040
// should have [rI/0, rII/0, rIII/20]
41-
e.DumpState(false)
42-
e.DumpIndex()
41+
e.DumpState(false)
42+
e.DumpIndex()
4343
fmt.Println("----")
44-
e.NewStep()
45-
e.DumpIndex()
46-
e.NewStep()
47-
e.DumpIndex()
48-
e.NewStep()
49-
e.DumpIndex()
44+
e.NewStep()
45+
e.DumpIndex()
46+
e.NewStep()
47+
e.DumpIndex()
48+
e.NewStep()
49+
e.DumpIndex()
5050

5151
fmt.Println("----- double step")
5252
e.SetRotorSettings([]int{0, 3, 20})
@@ -63,25 +63,25 @@ func testNewStep() {
6363
}
6464

6565
func main() {
66-
e, _ := machine.NewEnigma(3)
67-
err := e.Setup(rotors)
68-
if err != nil {
69-
log.Fatalf("Invalid Setup() with %#v", rotors)
70-
}
66+
e, _ := machine.NewEnigma(3)
67+
err := e.Setup(rotors)
68+
if err != nil {
69+
log.Fatalf("Invalid Setup() with %#v", rotors)
70+
}
7171

72-
err = e.AddReflector(RfB)
73-
if err != nil {
74-
log.Fatalf("Invalid AddReflector() with %#v", RfB)
75-
}
72+
err = e.AddReflector(RfB)
73+
if err != nil {
74+
log.Fatalf("Invalid AddReflector() with %#v", RfB)
75+
}
7676

77-
e.SetPlugboard(PBS)
78-
e.DumpState(true)
77+
e.SetPlugboard(PBS)
78+
e.DumpState(true)
7979

80-
plain := "AAAAA"
81-
want := "BDZGO"
80+
plain := "AAAAA"
81+
want := "BDZGO"
8282

83-
cipher := e.Encrypt(plain)
84-
fmt.Printf("Plain: %s\nCipher: %s\nWant: %s\n", plain, cipher, want)
83+
cipher := e.Encrypt(plain)
84+
fmt.Printf("Plain: %s\nCipher: %s\nWant: %s\n", plain, cipher, want)
8585

86-
testNewStep()
86+
testNewStep()
8787
}

‎enigma.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func (m *Enigma) DumpIndex() {
260260
off = 0
261261
}
262262
ri2 := intToText[m.RotorSet[off].index]
263-
ri1 := intToText[m.RotorSet[off + 1].index]
264-
ri0 := intToText[m.RotorSet[off + 2].index]
263+
ri1 := intToText[m.RotorSet[off+1].index]
264+
ri0 := intToText[m.RotorSet[off+2].index]
265265
fmt.Printf("%s%s%s%s\n", ri3, ri2, ri1, ri0)
266266
}

‎enigma_test.go

+93-93
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,127 @@
11
package machine
22

33
import (
4-
"testing"
5-
"github.com/stretchr/testify/assert"
4+
"github.com/stretchr/testify/assert"
5+
"testing"
66
)
77

88
func TestNewEnigma(t *testing.T) {
9-
e, err := NewEnigma(3)
10-
assert.EqualValues(t, e.Size, 3, "should be equal")
11-
assert.Nil(t, err, "no error")
12-
13-
e, err = NewEnigma(4)
14-
assert.Nil(t, err, "no error")
15-
assert.EqualValues(t, e.Size, 4, "should be equal")
16-
17-
e, err = NewEnigma(666)
18-
assert.Error(t, err, "should protest")
19-
assert.Panics(t, func() {
20-
var _ = e.Size
21-
}, "should panic")
9+
e, err := NewEnigma(3)
10+
assert.EqualValues(t, e.Size, 3, "should be equal")
11+
assert.Nil(t, err, "no error")
12+
13+
e, err = NewEnigma(4)
14+
assert.Nil(t, err, "no error")
15+
assert.EqualValues(t, e.Size, 4, "should be equal")
16+
17+
e, err = NewEnigma(666)
18+
assert.Error(t, err, "should protest")
19+
assert.Panics(t, func() {
20+
var _ = e.Size
21+
}, "should panic")
2222
}
2323

2424
func TestEnigma_Setup(t *testing.T) {
25-
var rotors = []string{
26-
rIII,
27-
rII,
28-
rI,
29-
}
25+
var rotors = []string{
26+
rIII,
27+
rII,
28+
rI,
29+
}
3030

31-
e, _ := NewEnigma(3)
32-
err := e.Setup(rotors)
31+
e, _ := NewEnigma(3)
32+
err := e.Setup(rotors)
3333

34-
rrI, _ := NewRotor(rI, false)
35-
rrII, _ := NewRotor(rII, false)
36-
rrIII, _ := NewRotor(rIII, false)
34+
rrI, _ := NewRotor(rI, false)
35+
rrII, _ := NewRotor(rII, false)
36+
rrIII, _ := NewRotor(rIII, false)
3737

38-
assert.NoError(t, err, "should be ok")
39-
assert.EqualValues(t, e.RotorSet[2], rrI, "should be equal")
40-
assert.EqualValues(t, e.RotorSet[1], rrII, "should be equal")
41-
assert.EqualValues(t, e.RotorSet[0], rrIII, "should be equal")
38+
assert.NoError(t, err, "should be ok")
39+
assert.EqualValues(t, e.RotorSet[2], rrI, "should be equal")
40+
assert.EqualValues(t, e.RotorSet[1], rrII, "should be equal")
41+
assert.EqualValues(t, e.RotorSet[0], rrIII, "should be equal")
4242

43-
assert.Nil(t, e.PlugBoard, "should be nil")
44-
assert.Nil(t, e.Reflector, "should be nil")
43+
assert.Nil(t, e.PlugBoard, "should be nil")
44+
assert.Nil(t, e.Reflector, "should be nil")
4545

46-
rotors[0] = "JHJHSJDHJSHDKHDHKSHDKJSHDKJSHDKJHSKJDH"
47-
err = e.Setup(rotors)
48-
assert.Error(t, err, "should be in error")
46+
rotors[0] = "JHJHSJDHJSHDKHDHKSHDKJSHDKJSHDKJHSKJDH"
47+
err = e.Setup(rotors)
48+
assert.Error(t, err, "should be in error")
4949

50-
rotors[0] = rVI
51-
// Now we have [rVI, rII, rI]
52-
err = e.Setup(rotors)
50+
rotors[0] = rVI
51+
// Now we have [rVI, rII, rI]
52+
err = e.Setup(rotors)
5353

54-
rrVI, _ := NewRotor(rVI, false)
54+
rrVI, _ := NewRotor(rVI, false)
5555

56-
assert.EqualValues(t, e.RotorSet[0], rrVI, "should be equal")
57-
assert.NoError(t, err, "should not be in error")
56+
assert.EqualValues(t, e.RotorSet[0], rrVI, "should be equal")
57+
assert.NoError(t, err, "should not be in error")
5858

59-
rotors = append(rotors, "JHJHSJDHJSHDKHDHKSHDKJSHDKJSHDKJHSKJDH")
60-
err = e.Setup(rotors)
61-
assert.Error(t, err, "should be in error")
59+
rotors = append(rotors, "JHJHSJDHJSHDKHDHKSHDKJSHDKJSHDKJHSKJDH")
60+
err = e.Setup(rotors)
61+
assert.Error(t, err, "should be in error")
6262

6363
}
6464

6565
func TestEnigma_SetRotorSettings(t *testing.T) {
66-
// [rIII, rII, rI]
67-
var rotors = []string{
68-
rIII,
69-
rII,
70-
rI,
71-
}
72-
73-
var set = []int{1, 4, 2}
74-
75-
e, _ := NewEnigma(3)
76-
assert.Panics(t, func() {
77-
e.SetRotorSettings(set)
78-
}, "should panic")
79-
80-
err := e.Setup(rotors)
81-
if err != nil {
82-
t.Error(err)
83-
}
84-
e.SetPlugboard(PBS)
85-
e.AddReflector(RfB)
86-
e.SetRotorSettings(set)
87-
88-
// should have [rIII/1, rII/4, rI/2]
89-
assert.EqualValues(t, e.RotorSet[0].index, 1, "should be equal")
90-
assert.EqualValues(t, e.RotorSet[1].index, 4, "should be equal")
91-
assert.EqualValues(t, e.RotorSet[2].index, 2, "should be equal")
66+
// [rIII, rII, rI]
67+
var rotors = []string{
68+
rIII,
69+
rII,
70+
rI,
71+
}
72+
73+
var set = []int{1, 4, 2}
74+
75+
e, _ := NewEnigma(3)
76+
assert.Panics(t, func() {
77+
e.SetRotorSettings(set)
78+
}, "should panic")
79+
80+
err := e.Setup(rotors)
81+
if err != nil {
82+
t.Error(err)
83+
}
84+
e.SetPlugboard(PBS)
85+
e.AddReflector(RfB)
86+
e.SetRotorSettings(set)
87+
88+
// should have [rIII/1, rII/4, rI/2]
89+
assert.EqualValues(t, e.RotorSet[0].index, 1, "should be equal")
90+
assert.EqualValues(t, e.RotorSet[1].index, 4, "should be equal")
91+
assert.EqualValues(t, e.RotorSet[2].index, 2, "should be equal")
9292
}
9393

9494
func TestEnigma_SetPlugboard(t *testing.T) {
9595

96-
e, _ := NewEnigma(3)
97-
e.SetPlugboard(PBS)
96+
e, _ := NewEnigma(3)
97+
e.SetPlugboard(PBS)
9898

99-
realPBS := map[int]int{12:19, 11:20, 0:16, 10:22, 5:23, 15:18, 1:3, 4:9, 14:24, 8:21}
99+
realPBS := map[int]int{12: 19, 11: 20, 0: 16, 10: 22, 5: 23, 15: 18, 1: 3, 4: 9, 14: 24, 8: 21}
100100

101-
assert.EqualValues(t, e.PlugBoard, realPBS, "should be equal")
101+
assert.EqualValues(t, e.PlugBoard, realPBS, "should be equal")
102102
}
103103

104104
func TestEnigma_AddReflector(t *testing.T) {
105-
var rotors = []string{
106-
rI,
107-
rII,
108-
rIII,
109-
}
110-
111-
e, _ := NewEnigma(3)
112-
err := e.Setup(rotors)
113-
assert.NoError(t, err, "no error")
114-
assert.NotNil(t, e.RotorSet, "rs not null")
115-
116-
err = e.AddReflector(RfB)
117-
assert.NoError(t, err, "no error")
118-
assert.NotNil(t, e.Reflector, "refl not null")
119-
120-
realPfB, _ := NewRotor(RfB, true)
121-
assert.Equal(t, e.Reflector, realPfB, "should be equal")
122-
123-
arrayPfB := []int{24, 17, 20, 7, 16, 18, 11, 3, 15, 23, 13, 6, 14, 10, 12, 8, 4, 1, 5, 25, 2, 22, 21, 9, 0, 19}
124-
assert.EqualValues(t, e.Reflector.rotor, arrayPfB, "should be equal")
105+
var rotors = []string{
106+
rI,
107+
rII,
108+
rIII,
109+
}
110+
111+
e, _ := NewEnigma(3)
112+
err := e.Setup(rotors)
113+
assert.NoError(t, err, "no error")
114+
assert.NotNil(t, e.RotorSet, "rs not null")
115+
116+
err = e.AddReflector(RfB)
117+
assert.NoError(t, err, "no error")
118+
assert.NotNil(t, e.Reflector, "refl not null")
119+
120+
realPfB, _ := NewRotor(RfB, true)
121+
assert.Equal(t, e.Reflector, realPfB, "should be equal")
122+
123+
arrayPfB := []int{24, 17, 20, 7, 16, 18, 11, 3, 15, 23, 13, 6, 14, 10, 12, 8, 4, 1, 5, 25, 2, 22, 21, 9, 0, 19}
124+
assert.EqualValues(t, e.Reflector.rotor, arrayPfB, "should be equal")
125125
}
126126

127127
func TestEnigma_Encrypt(t *testing.T) {

0 commit comments

Comments
 (0)