aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--config/config_test.go12
-rw-r--r--config/menu.go12
-rw-r--r--config/menu_test.go14
3 files changed, 3 insertions, 35 deletions
diff --git a/config/config_test.go b/config/config_test.go
index 74c7996..98dad66 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -120,9 +120,7 @@ func TestLoadFile(t *testing.T) {
},
Menus: map[string]Menu{
"anonymous": Menu{
- Banner: "Shell Game Launcher - Anonymous access%n======================================",
- XOffset: 5,
- YOffset: 2,
+ Banner: "Shell Game Launcher - Anonymous access%n======================================",
MenuEntries: []MenuEntry{
MenuEntry{
Key: "l",
@@ -147,9 +145,7 @@ func TestLoadFile(t *testing.T) {
},
},
"logged_in": Menu{
- Banner: "Shell Game Launcher%n===================",
- XOffset: 5,
- YOffset: 2,
+ Banner: "Shell Game Launcher%n===================",
MenuEntries: []MenuEntry{
MenuEntry{
Key: "p",
@@ -189,9 +185,7 @@ func TestLoadFile(t *testing.T) {
},
},
"options": Menu{
- Banner: "Options%n=======",
- XOffset: 5,
- YOffset: 2,
+ Banner: "Options%n=======",
MenuEntries: []MenuEntry{
MenuEntry{
Key: "z",
diff --git a/config/menu.go b/config/menu.go
index a8ea7b0..7321c7b 100644
--- a/config/menu.go
+++ b/config/menu.go
@@ -14,10 +14,6 @@ var reValidKey = regexp.MustCompile(`^\w$`)
type Menu struct {
// Banner is the banner to display before the menu
Banner string `yaml:"Banner"`
- // XOffset is the X offset between the banner and the menu
- XOffset int `yaml:"XOffset"`
- // YOffset is the Y offset between the banner and the menu
- YOffset int `yaml:"YOffset"`
// Commands is the list of commands in the menu
MenuEntries []MenuEntry `yaml:"MenuEntries"`
}
@@ -38,14 +34,6 @@ func (m *Menu) validate(name string) error {
return errors.New("Invalid menu name, must be an alphanumeric word and match regex `^[\\w\\._]+$` : " + name)
}
// Banner is just any string, nothing to validate
- // XOffset
- if m.XOffset < 0 {
- return errors.New("XOffset must be a positive integer")
- }
- // YOffset
- if m.YOffset < 0 {
- return errors.New("YOffset must be a positive integer")
- }
// MenuEntries
if len(m.MenuEntries) == 0 {
return errors.New("A Menu needs MenuEntries to be valid")
diff --git a/config/menu_test.go b/config/menu_test.go
index 095b699..e9abef1 100644
--- a/config/menu_test.go
+++ b/config/menu_test.go
@@ -12,16 +12,6 @@ func TestMenuValidate(t *testing.T) {
t.Fatal("non alphanumeric menu name is not valid")
}
// Banner is just any string, nothing to validate
- // XOffset
- menu = Menu{XOffset: -1}
- if err := menu.validate("test"); err == nil {
- t.Fatal("Negative XOffset should not be valid")
- }
- // YOffset
- menu = Menu{YOffset: -1}
- if err := menu.validate("test"); err == nil {
- t.Fatal("Negative YOffset should not be valid")
- }
// MenuEntries are mostly tested bellow
menu = Menu{}
if err := menu.validate("test"); err == nil {
@@ -29,8 +19,6 @@ func TestMenuValidate(t *testing.T) {
}
// loop menu
menu = Menu{
- XOffset: 1,
- YOffset: 1,
MenuEntries: []MenuEntry{
MenuEntry{
Key: "a",
@@ -44,8 +32,6 @@ func TestMenuValidate(t *testing.T) {
}
// A valid menu
menu = Menu{
- XOffset: 1,
- YOffset: 1,
MenuEntries: []MenuEntry{
MenuEntry{
Key: "a",