Adapt to unikey validator changes

Author: dgurney

bench.go

@@ -67,15 +67,21 @@ func validationBenchmark(keys []string) {
 		switch {
 		case len(k) == 12 && k[4:5] == "-":
 			ki = validator.Mod7ElevenCD{
-				Key: k,
+				First:  k[0:4],
+				Second: k[5:12],
 			}
 		case len(k) == 11 && k[3:4] == "-":
 			ki = validator.Mod7CD{
-				Key: k,
+				First:  k[0:3],
+				Second: k[4:11],
 			}
 		case len(k) == 23 && k[5:6] == "-" && k[9:10] == "-" && k[17:18] == "-" && len(k[18:]) == 5:
 			ki = validator.Mod7OEM{
-				Key: k,
+				First: k[0:5],
+				// nice
+				Second: k[6:9],
+				Third:  k[10:17],
+				Fourth: k[18:],
 			}
 		}
 		go validator.Validate(ki, vch)

go.mod

@@ -2,6 +2,6 @@ module github.com/dgurney/unikey-mod7
 
 go 1.16
 
-require github.com/dgurney/unikey v0.1.1
+require github.com/dgurney/unikey v0.2.0
 
 // replace github.com/dgurney/unikey => ../unikey

go.sum

@@ -1,2 +1,4 @@
 github.com/dgurney/unikey v0.1.1 h1:lAqlsJcNVunt9MXnvyewImxdKmxFv10D0Xh9QNN0FNI=
 github.com/dgurney/unikey v0.1.1/go.mod h1:vHqV5+bSBPDtT7q2cxY9DBC/gizehUa/pgbqbWpyL0k=
+github.com/dgurney/unikey v0.2.0 h1:b8EDy1zJGmK6KCKFX94Qpzdip5qkTNet039yY3PPU2Y=
+github.com/dgurney/unikey v0.2.0/go.mod h1:vHqV5+bSBPDtT7q2cxY9DBC/gizehUa/pgbqbWpyL0k=

main.go

@@ -24,7 +24,7 @@ import (
 	"github.com/dgurney/unikey/validator"
 )
 
-const version = "0.1.5"
+const version = "0.2.0"
 
 func init() {
 	rand.Seed(time.Now().UnixNano())
@@ -70,15 +70,21 @@ func main() {
 		switch {
 		case len(k) == 12 && k[4:5] == "-":
 			ki = validator.Mod7ElevenCD{
-				Key: *validate,
+				First:  k[0:4],
+				Second: k[5:12],
 			}
 		case len(k) == 11 && k[3:4] == "-":
 			ki = validator.Mod7CD{
-				Key: *validate,
+				First:  k[0:3],
+				Second: k[4:11],
 			}
 		case len(k) == 23 && k[5:6] == "-" && k[9:10] == "-" && k[17:18] == "-" && len(k[18:]) == 5:
 			ki = validator.Mod7OEM{
-				Key: *validate,
+				First: k[0:5],
+				// nice
+				Second: k[6:9],
+				Third:  k[10:17],
+				Fourth: k[18:],
 			}
 		default:
 			fmt.Println("Could not recognize key type")