Make override constructor for args population

Reviewed-on: #13

cmd/africastalking/main.go

@@ -22,9 +22,8 @@ import (
 	
 	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
-
-	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 )
 
 var (
@@ -37,8 +36,7 @@ var (
 func main() {
 	config.LoadConfig()
 
-	var connStr string
-	var resourceDir string
+	override := config.NewOverride()
 	var size uint
 	var engineDebug bool
 	var host string
@@ -47,10 +45,11 @@ func main() {
 	var gettextDir string
 	var langs args.LangVar
 
-
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&connStr, "c", "", "connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
 	flag.UintVar(&port, "p", config.Port(), "http port")
@@ -58,16 +57,14 @@ func main() {
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	if connStr == "" {
-		connStr = config.DbConn()
-	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "build", build, "conn", connData, "resourcedir", resourceDir, "outputsize", size)
+	logg.Infof("start command", "build", build, "conn", conns, "outputsize", size)
 
 	ctx := context.Background()
 	ln, err := lang.LanguageFromCode(config.Language())
@@ -90,7 +87,7 @@ func main() {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	menuStorageService := storage.NewMenuStorageService(conns)
 	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "menustorageservice: %v\n", err)
@@ -102,7 +99,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, "userdatadb: %v\n", err)
 		os.Exit(1)
 	}
-	defer userdataStore.Close()
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -121,7 +117,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := &httpremote.HTTPAccountService{}
+	accountService := services.New(ctx, menuStorageService)
+	
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "httpaccountservice: %v\n", err)
@@ -133,7 +130,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, "getstatestore: %v\n", err)
 		os.Exit(1)
 	}
-	defer stateStore.Close()
 
 	rp := &at.ATRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
@@ -146,7 +142,10 @@ func main() {
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: mux,
 	}
-	s.RegisterOnShutdown(sh.Shutdown)
+	shutdownFunc := func() {
+		sh.Shutdown(ctx)
+	}
+	s.RegisterOnShutdown(shutdownFunc)
 
 	cint := make(chan os.Signal)
 	cterm := make(chan os.Signal)

cmd/async/main.go

@@ -17,7 +17,7 @@ import (
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
-	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
@@ -44,9 +44,8 @@ func (p *asyncRequestParser) GetInput(r any) ([]byte, error) {
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	override := config.NewOverride()
 	var sessionId string
-	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var host string
@@ -56,8 +55,11 @@ func main() {
 	var langs args.LangVar
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&connStr, "c", "", "connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
+
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
@@ -66,16 +68,14 @@ func main() {
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	if connStr == "" {
-		connStr = config.DbConn()
-	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", connData, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)
+	logg.Infof("start command", "conn", conns, "outputsize", size, "sessionId", sessionId)
 
 	ctx := context.Background()
 
@@ -99,7 +99,7 @@ func main() {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	menuStorageService := storage.NewMenuStorageService(conns)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -116,7 +116,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	defer userdataStore.Close()
+	//defer userdataStore.Close(ctx)
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -125,7 +125,8 @@ func main() {
 
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
-	accountService := &httpremote.HTTPAccountService{}
+
+	accountService := services.New(ctx, menuStorageService)
 
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
@@ -138,7 +139,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	defer stateStore.Close()
+	//defer stateStore.Close(ctx)
 
 	rp := &asyncRequestParser{
 		sessionId: sessionId,
@@ -160,7 +161,7 @@ func main() {
 		case _ = <-cint:
 		case _ = <-cterm:
 		}
-		sh.Shutdown()
+		sh.Shutdown(ctx)
 	}()
 
 	for true {
@@ -176,7 +177,7 @@ func main() {
 			fmt.Errorf("error in output: %v", err)
 			os.Exit(1)
 		}
-		rqs, err = sh.Reset(rqs)
+		rqs, err = sh.Reset(ctx, rqs)
 		if err != nil {
 			logg.ErrorCtxf(ctx, "error in reset: %v", "err", err)
 			fmt.Errorf("error in reset: %v", err)

cmd/http/main.go

@@ -21,7 +21,7 @@ import (
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 
-	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
@@ -35,8 +35,7 @@ var (
 func main() {
 	config.LoadConfig()
 
-	var connStr string
-	var resourceDir string
+	override := config.NewOverride()
 	var size uint
 	var engineDebug bool
 	var host string
@@ -45,8 +44,11 @@ func main() {
 	var gettextDir string
 	var langs args.LangVar
 
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&connStr, "c", "", "connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
+
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
@@ -55,16 +57,14 @@ func main() {
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	if connStr == "" {
-		connStr = config.DbConn()
-	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", connData, "resourcedir", resourceDir, "outputsize", size)
+	logg.Infof("start command", "conn", conns, "outputsize", size)
 
 	ctx := context.Background()
 
@@ -88,7 +88,7 @@ func main() {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	menuStorageService := storage.NewMenuStorageService(conns)
 
 	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
@@ -101,7 +101,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	defer userdataStore.Close()
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -116,7 +115,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := &httpremote.HTTPAccountService{}
+	accountService := services.New(ctx, menuStorageService)
+	
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@@ -128,7 +128,8 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	defer stateStore.Close()
+
+	//accountService := services.New(ctx, menuStorageService, connData)
 
 	rp := &httprequest.DefaultRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
@@ -137,7 +138,10 @@ func main() {
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: sh,
 	}
-	s.RegisterOnShutdown(sh.Shutdown)
+	shutdownFunc := func() {
+		sh.Shutdown(ctx)
+	}
+	s.RegisterOnShutdown(shutdownFunc)
 
 	cint := make(chan os.Signal)
 	cterm := make(chan os.Signal)

cmd/main.go

@@ -5,7 +5,9 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"os/signal"
 	"path"
+	"syscall"
 
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
@@ -27,34 +29,33 @@ var (
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	override := config.NewOverride()
 	var size uint
 	var sessionId string
 	var engineDebug bool
-	var resourceDir string
 	var err error
 	var gettextDir string
 	var langs args.LangVar
 
-	flag.StringVar(&resourceDir, "resourcedir", scriptDir, "resource dir")
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&connStr, "c", "", "connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	if connStr == "" {
-		connStr = config.DbConn()
-	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v\n", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", connData, "outputsize", size)
+	logg.Infof("start command", "conn", conns, "outputsize", size)
 
 	if len(langs.Langs()) == 0 {
 		langs.Set(config.Language())
@@ -80,7 +81,7 @@ func main() {
 		MenuSeparator: menuSeparator,
 	}
 
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	menuStorageService := storage.NewMenuStorageService(conns)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "menu storage service error: %v\n", err)
 		os.Exit(1)
@@ -122,7 +123,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := services.New(ctx, menuStorageService, connData)
+	accountService := services.New(ctx, menuStorageService)
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err)
@@ -135,6 +136,18 @@ func main() {
 		en = en.WithDebug(nil)
 	}
 
+	cint := make(chan os.Signal)
+	cterm := make(chan os.Signal)
+	signal.Notify(cint, os.Interrupt, syscall.SIGINT)
+	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
+	go func() {
+		select {
+		case _ = <-cint:
+		case _ = <-cterm:
+		}
+		menuStorageService.Close(ctx)
+	}()
+
 	err = engine.Loop(ctx, en, os.Stdin, os.Stdout, nil)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "loop exited with error: %v\n", err)

cmd/ssh/main.go

@@ -31,34 +31,31 @@ var (
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	var override config.Override
 	var authConnStr string
-	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var stateDebug bool
 	var host string
 	var port uint
-	flag.StringVar(&connStr, "c", "", "connection string")
-	flag.StringVar(&authConnStr, "authdb", "", "auth connection string")
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
+	//flag.StringVar(&authConnStr, "authdb", "", "auth connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.HostSSH(), "socket host")
 	flag.UintVar(&port, "p", config.PortSSH(), "socket port")
 	flag.Parse()
 
-	if connStr == "" {
-		connStr = config.DbConn()
-	}
-	if authConnStr == "" {
-		authConnStr = connStr
-	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(&override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
+
 	authConnData, err := storage.ToConnData(authConnStr)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "auth connstr err: %v", err)
@@ -79,14 +76,14 @@ func main() {
 	logg.WarnCtxf(ctx, "!!!!! Do not expose to internet and only use with tunnel!")
 	logg.WarnCtxf(ctx, "!!!!! (See ssh -L <...>)")
 
-	logg.Infof("start command", "conn", connData, "authconn", authConnData, "resourcedir", resourceDir, "outputsize", size, "keyfile", sshKeyFile, "host", host, "port", port)
+	logg.Infof("start command", "conn", conns, "authconn", authConnData, "outputsize", size, "keyfile", sshKeyFile, "host", host, "port", port)
 
 	pfp := path.Join(scriptDir, "pp.csv")
 
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(16),
+		FlagCount:  uint32(128),
 	}
 	if stateDebug {
 		cfg.StateDebug = true
@@ -102,7 +99,7 @@ func main() {
 	}
 	defer func() {
 		logg.TraceCtxf(ctx, "shutdown auth key store reached")
-		err = authKeyStore.Close()
+		err = authKeyStore.Close(ctx)
 		if err != nil {
 			logg.ErrorCtxf(ctx, "keystore close error", "err", err)
 		}
@@ -117,8 +114,7 @@ func main() {
 		Cfg: cfg,
 		Debug: engineDebug,
 		FlagFile: pfp,
-		Conn: connData,
-		ResourceDir: resourceDir,
+		Conn: conns,
 		SrvKeyFile:  sshKeyFile,
 		Host:        host,
 		Port:        port,

cmd/ssh/sshkey/main.go

@@ -34,7 +34,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
-	defer store.Close()
+	defer store.Close(ctx)
 
 	err = store.AddFromFile(ctx, sshKeyFile, sessionId)
 	if err != nil {

config/args.go

@@ -0,0 +1,31 @@
+package config
+
+import (
+	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
+)
+
+type Override struct {
+	DbConn *string
+	StateConn *string
+	ResourceConn *string
+	UserConn *string
+}
+
+func NewOverride() *Override {
+	var a string
+	var b string
+	var c string
+	var d string
+	o := &Override{
+		DbConn: &a,
+		StateConn: &b,
+		ResourceConn: &c,
+		UserConn: &d,
+	}
+	return o
+}
+
+func Apply(o *Override) error {
+	viseconfig.ApplyConn(o.DbConn, o.StateConn, o.ResourceConn, o.UserConn)
+	return nil
+}

config/config.go

@@ -6,8 +6,17 @@ import (
 	apiconfig "git.grassecon.net/grassrootseconomics/sarafu-api/config"
 )
 
-func init() {
-	env.LoadEnvVariables()
+var (
+	GetConns = viseconfig.GetConns
+	EnvPath string
+)
+
+func loadEnv() {
+	if EnvPath == "" {
+		env.LoadEnvVariables()
+	} else {
+		env.LoadEnvVariablesPath(EnvPath)
+	}
 }
 
 const (
@@ -17,8 +26,8 @@ const (
 	defaultHTTPPort uint = 7123
 )
 
-
 func LoadConfig() error {
+	loadEnv()
 	err := viseconfig.LoadConfig()
 	if err != nil {
 		return err
@@ -30,10 +39,6 @@ func LoadConfig() error {
 	return nil
 }
 
-func DbConn() string {
-	return viseconfig.DbConn
-}
-
 func Language() string {
 	return viseconfig.DefaultLanguage
 }

debug/db.go

@@ -32,18 +32,10 @@ func (k KeyInfo) String() string {
 
 func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
 	o := KeyInfo{}
-	b := []byte(sessionId)
-
-	if len(k) <= len(b) {
-		return o, fmt.Errorf("storage key missing")
-	}
 
 	o.SessionId = sessionId
-
 	o.Typ = uint8(k[0])
 	k = k[1:]
-	o.SessionId = string(k[:len(b)])
-	k = k[len(b):]
 
 	if o.Typ == visedb.DATATYPE_USERDATA {
 		if len(k) == 0 {
@@ -53,28 +45,18 @@ func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
 		o.SubTyp = storedb.DataTyp(v)
 		o.Label = subTypToString(o.SubTyp)
 		k = k[2:]
+		if len(k) != 0 {
+			return o, fmt.Errorf("excess key information: %x", k)
+		}
 	} else {
 		o.Label = typToString(o.Typ)
+		k = k[2:]
 	}
 
-	if len(k) != 0 {
-		return o, fmt.Errorf("excess key information")
-	}
 
 	return o, nil
 }
 
-func FromKey(k []byte) (KeyInfo, error) {
-	o := KeyInfo{}
-
-	if len(k) < 4 {
-		return o, fmt.Errorf("insufficient key length")
-	}
-
-	sessionIdBytes := k[1:len(k)-2]
-	return ToKeyInfo(k, string(sessionIdBytes))
-}
-
 func subTypToString(v storedb.DataTyp) string {
 	return dbTypStr[v + visedb.DATATYPE_USERDATA + 1]
 }

debug/db_debug.go

@@ -29,6 +29,9 @@ func init() {
 	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_PUBLIC_KEY_REVERSE] = "public_key_reverse"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_DECIMAL] = "active decimal"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_ADDRESS] = "active address"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_INCORRECT_PIN_ATTEMPTS] = "incorrect pin attempts"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_SELECTED_LANGUAGE_CODE] = "selected language"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_INITIAL_LANGUAGE_CODE] = "initial language"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_SYMBOLS] = "voucher symbols"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_BALANCES] = "voucher balances"
 	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_DECIMALS] = "voucher decimals"

debug/db_test.go

@@ -10,7 +10,6 @@ import (
 func TestDebugDbSubKeyInfo(t *testing.T) {
 	s := "foo"
 	b := []byte{0x20}
-	b = append(b, []byte(s)...)
 	b = append(b, []byte{0x00, 0x02}...)
 	r, err := ToKeyInfo(b, s)
 	if err != nil {
@@ -56,7 +55,6 @@ func TestDebugDbKeyInfo(t *testing.T) {
 func TestDebugDbKeyInfoRestore(t *testing.T) {
 	s := "bar"
 	b := []byte{visedb.DATATYPE_USERDATA}
-	b = append(b, []byte(s)...)
 	k := storedb.ToBytes(storedb.DATA_ACTIVE_SYM)
 	b = append(b, k...)
 

devtools/admin/admin_numbers.json

@@ -1,7 +0,0 @@
-{
-  "admins": [
-    {
-      "phonenumber" : "<replace with any admin number to test with >"
-    }
-   ]
-}

devtools/admin/commands/seed.go

@@ -1,47 +0,0 @@
-package commands
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-)
-
-var (
-	logg = logging.NewVanilla().WithDomain("adminstore")
-)
-
-type Admin struct {
-	PhoneNumber string `json:"phonenumber"`
-}
-
-type Config struct {
-	Admins []Admin `json:"admins"`
-}
-
-func Seed(ctx context.Context) error {
-	var config Config
-	adminstore, err := store.NewAdminStore(ctx, "../admin_numbers")
-	store := adminstore.FsStore
-	if err != nil {
-		return err
-	}
-	defer store.Close()
-	data, err := os.ReadFile("admin_numbers.json")
-	if err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &config); err != nil {
-		return err
-	}
-	for _, admin := range config.Admins {
-		err := store.Put(ctx, []byte(admin.PhoneNumber), []byte("1"))
-		if err != nil {
-			logg.Printf(logging.LVL_DEBUG, "Failed to insert admin number", admin.PhoneNumber)
-			return err
-		}
-	}
-	return nil
-}

devtools/admin/main.go

@@ -2,16 +2,73 @@ package main
 
 import (
 	"context"
-	"log"
+	"flag"
+	"fmt"
+	"os"
+	"path"
 
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/devtools/admin/commands"
+	"git.defalsify.org/vise.git/logging"
+
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
+)
+
+var (
+	logg = logging.NewVanilla().WithContextKey("SessionId")
+	scriptDir     = path.Join("services", "registration")
 )
 
 func main() {
-	ctx := context.Background()
-	err := commands.Seed(ctx)
+	config.LoadConfig()
+
+	var sessionId string
+	var override config.Override
+
+	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
+	flag.Parse()
+
+	config.Apply(&override)
+	conns, err := config.GetConns()
 	if err != nil {
-		log.Fatalf("Failed to initialize a list of admins with error %s", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
+		os.Exit(1)
+	}
+
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)
+
+	pfp := path.Join(scriptDir, "pp.csv")
+	flagParser, err := application.NewFlagManager(pfp)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "flagparser fail: %v\n", err)
+		os.Exit(1)
+	}
+
+	x := cmd.NewCmd(sessionId, flagParser)
+	err = x.Parse(flag.Args())
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "cmd parse fail: %v\n", err)
+		os.Exit(1)
+	}
+
+	logg.Infof("start command", "conn", conns, "subcmd", x)
+
+	menuStorageService := storage.NewMenuStorageService(conns)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "menu storage service error: %v\n", err)
+		os.Exit(1)
+	}
+
+	err = x.Exec(ctx, menuStorageService)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "cmd exec error: %v\n", err)
+		os.Exit(1)
 	}
 
 }

devtools/store/dump/main.go

@@ -19,55 +19,58 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
-func formatItem(k []byte, v []byte) (string, error) {
-	o, err := debug.FromKey(k)
+func formatItem(k []byte, v []byte, sessionId string) (string, error) {
+	o, err := debug.ToKeyInfo(k, sessionId)
 	if err != nil {
 		return "", err
 	}
-	s := fmt.Sprintf("%vValue: %v\n\n", o, string(v))
+	s := fmt.Sprintf("%v\t%v\n", o.Label, string(v))
+
 	return s, nil
 }
 
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	var override config.Override
 	var sessionId string
 	var database string
 	var engineDebug bool
 	var err error
+	var first bool
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&connStr, "c", ".state", "connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.Parse()
 
-	if connStr != "" {
-		connStr = config.DbConn()
-	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(&override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", connData)
+	logg.Infof("start command", "conn", conns)
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 	ctx = context.WithValue(ctx, "Database", database)
 
-	resourceDir := scriptDir
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	menuStorageService := storage.NewMenuStorageService(conns)
 
 	store, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "get userdata db: %v\n", err.Error())
 		os.Exit(1)
 	}
+	store.SetSession(sessionId)
 	store.SetPrefix(db.DATATYPE_USERDATA)
 
-	d, err := store.Dump(ctx, []byte(sessionId))
+	d, err := store.Dump(ctx, []byte(""))
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "store dump fail: %v\n", err.Error())
 		os.Exit(1)
@@ -78,15 +81,19 @@ func main() {
 		if k == nil {
 			break
 		}
-		r, err := formatItem(k, v)
+		if !first {
+			fmt.Printf("Session ID: %s\n---\n", sessionId)
+			first = true
+		}
+		r, err := formatItem(append([]byte{db.DATATYPE_USERDATA}, k...), v, sessionId)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "format db item error: %v", err)
+			fmt.Fprintf(os.Stderr, "format db item error: %v\n", err)
 			os.Exit(1)
 		}
 		fmt.Printf(r)
 	}
 
-	err = store.Close()
+	err = store.Close(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)

devtools/store/generate/main.go

@@ -1,86 +0,0 @@
-package main
-
-import (
-	"context"
-	"crypto/sha1"
-	"flag"
-	"fmt"
-	"os"
-	"path"
-
-	testdataloader "github.com/peteole/testdata-loader"
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-)
-
-var (
-	logg      = logging.NewVanilla()
-	baseDir   = testdataloader.GetBasePath()
-	scriptDir = path.Join("services", "registration")
-)
-
-func main() {
-	config.LoadConfig()
-
-	var connStr string
-	var sessionId string
-	var database string
-	var engineDebug bool
-	var err error
-
-	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&connStr, "c", "", "connection string")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
-	flag.Parse()
-
-	if connStr != "" {
-		connStr = config.DbConn()
-	}
-	connData, err := storage.ToConnData(connStr)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
-		os.Exit(1)
-	}
-
-	logg.Infof("start command", "conn", connData)
-
-	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	ctx = context.WithValue(ctx, "Database", database)
-
-	resourceDir := scriptDir
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
-	
-	userDb, err := menuStorageService.GetUserdataDb(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	userStore := store.UserDataStore{userDb}
-
-	h := sha1.New()
-	h.Write([]byte(sessionId))
-	address := h.Sum(nil)
-	addressString := fmt.Sprintf("%x", address)
-
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(addressString))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	err = userStore.WriteEntry(ctx, addressString, storedb.DATA_PUBLIC_KEY_REVERSE, []byte(sessionId))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	err = userDb.Close()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-}

go.mod

@@ -3,11 +3,11 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4
 
 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250115000535-e2d329b3f739
-	git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250115072214-bca7c5de969f
-	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63
-	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d
+	git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
+	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805
+	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250121134912-f7d31e4e8162
+	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta

go.sum

@@ -1,13 +1,13 @@
-git.defalsify.org/vise.git v0.2.3-0.20250115000535-e2d329b3f739 h1:w7pj1oh7jXrfajahVYU7m7AfHst4C6jNVzDVoaqJ7e8=
-git.defalsify.org/vise.git v0.2.3-0.20250115000535-e2d329b3f739/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05 h1:BenzGx6aDHKDwE23/mWIFD2InYIXyzHroZWV3MF5WUk=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250115072214-bca7c5de969f h1:FgccQi8vipX6dUt+GRiRDYHMR3UqC+plz73vw7y3fyU=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250115072214-bca7c5de969f/go.mod h1:tbA4whUGMUIDgQVdIW0sxWPuuXOvZRSny5zeku5hX4k=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63 h1:bX7klKZpX+ZZu1LKbtOXDAhV/KK0YwExehiIi0jusAM=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63/go.mod h1:Syw9TZyigPAM7t9FvicOm36iUnidt45f0SxzT2JniQ8=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d h1:q/NO1rEgK3pia32D/tCq5hXfEuJp84COZRwceFvy/MM=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d/go.mod h1:AH15xABcvaJr1TCGlih3oGSuwWC0E5IdbHQwuu+E1KI=
+git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
+git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805 h1:deGnqf4YCsbxhXgjFEjYjTUCvciLEmI26T9IysRsQXY=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805/go.mod h1:9bc3d//Qqm11hz7GYRdQc1Uan+0GJIOpvRBbv8cHMu8=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250121134912-f7d31e4e8162 h1:NaPbgGQ1Nb+yYF+Qj1LSagpjYeDcSXST8iZwONg4afY=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250121134912-f7d31e4e8162/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk=
+git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84 h1:VoBmqsjlRdz+IPbtKsAkc1IrMepjR+QlesZT31Jokrk=
+git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=

handlers/application/menuhandler_test.go

@@ -14,11 +14,11 @@ import (
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/testservice"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	"git.grassecon.net/grassrootseconomics/common/pin"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/testservice"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 
 	"github.com/alecthomas/assert/v2"
@@ -54,7 +54,7 @@ func InitializeTestStore(t *testing.T) (context.Context, *store.UserDataStore) {
 	store := &store.UserDataStore{Db: db}
 
 	t.Cleanup(func() {
-		db.Close() // Ensure the DB is closed after each test
+		db.Close(ctx) // Ensure the DB is closed after each test
 	})
 
 	return ctx, store
@@ -84,7 +84,7 @@ func TestNewMenuHandlers(t *testing.T) {
 
 	// Test case for valid UserDataStore
 	t.Run("Valid UserDataStore", func(t *testing.T) {
-		handlers, err := NewMenuHandlers(fm.parser, store, nil, &accountService, mockReplaceSeparator)
+		handlers, err := NewMenuHandlers(fm, store, &accountService, mockReplaceSeparator)
 		if err != nil {
 			t.Fatalf("expected no error, got %v", err)
 		}
@@ -108,7 +108,7 @@ func TestNewMenuHandlers(t *testing.T) {
 
 	// Test case for nil UserDataStore
 	t.Run("Nil UserDataStore", func(t *testing.T) {
-		handlers, err := NewMenuHandlers(fm.parser, nil, nil, &accountService, mockReplaceSeparator)
+		handlers, err := NewMenuHandlers(fm, nil, &accountService, mockReplaceSeparator)
 		if err == nil {
 			t.Fatal("expected an error, got none")
 		}
@@ -132,16 +132,9 @@ func TestInit(t *testing.T) {
 		t.Fatal(err.Error())
 	}
 
-	adminstore, err := store.NewAdminStore(ctx, "admin_numbers")
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-
 	st := state.NewState(128)
 	ca := cache.NewCache()
 
-	flag_admin_privilege, _ := fm.GetFlag("flag_admin_privilege")
-
 	tests := []struct {
 		name           string
 		setup          func() (*MenuHandlers, context.Context)
@@ -161,49 +154,40 @@ func TestInit(t *testing.T) {
 			setup: func() (*MenuHandlers, context.Context) {
 				pe := persist.NewPersister(testStore).WithSession(sessionId).WithContent(st, ca)
 				h := &MenuHandlers{
-					flagManager: fm.parser,
-					adminstore:  adminstore,
+					flagManager: fm,
 					pe:          pe,
 				}
 				return h, context.WithValue(ctx, "SessionId", sessionId)
 			},
-			input: []byte("1"),
-			expectedResult: resource.Result{
-				FlagReset: []uint32{flag_admin_privilege},
-			},
+			input:          []byte("1"),
+			expectedResult: resource.Result{},
 		},
 		{
 			name: "Non-admin session initialization",
 			setup: func() (*MenuHandlers, context.Context) {
 				pe := persist.NewPersister(testStore).WithSession("0712345678").WithContent(st, ca)
 				h := &MenuHandlers{
-					flagManager: fm.parser,
-					adminstore:  adminstore,
+					flagManager: fm,
 					pe:          pe,
 				}
 				return h, context.WithValue(context.Background(), "SessionId", "0712345678")
 			},
-			input: []byte("1"),
-			expectedResult: resource.Result{
-				FlagReset: []uint32{flag_admin_privilege},
-			},
+			input:          []byte("1"),
+			expectedResult: resource.Result{},
 		},
 		{
 			name: "Move to top node on empty input",
 			setup: func() (*MenuHandlers, context.Context) {
 				pe := persist.NewPersister(testStore).WithSession(sessionId).WithContent(st, ca)
 				h := &MenuHandlers{
-					flagManager: fm.parser,
-					adminstore:  adminstore,
+					flagManager: fm,
 					pe:          pe,
 				}
 				st.Code = []byte("some pending bytecode")
 				return h, context.WithValue(ctx, "SessionId", sessionId)
 			},
-			input: []byte(""),
-			expectedResult: resource.Result{
-				FlagReset: []uint32{flag_admin_privilege},
-			},
+			input:          []byte(""),
+			expectedResult: resource.Result{},
 		},
 	}
 
@@ -256,7 +240,7 @@ func TestCreateAccount(t *testing.T) {
 			h := &MenuHandlers{
 				userdataStore:  store,
 				accountService: mockAccountService,
-				flagManager:    fm.parser,
+				flagManager:    fm,
 			}
 
 			mockAccountService.On("CreateAccount").Return(tt.serverResponse, nil)
@@ -320,7 +304,7 @@ func TestSaveFirstname(t *testing.T) {
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm.parser,
+		flagManager:   fm,
 		st:            mockState,
 	}
 
@@ -365,7 +349,7 @@ func TestSaveFamilyname(t *testing.T) {
 	h := &MenuHandlers{
 		userdataStore: store,
 		st:            mockState,
-		flagManager:   fm.parser,
+		flagManager:   fm,
 	}
 
 	// Call the method
@@ -408,7 +392,7 @@ func TestSaveYoB(t *testing.T) {
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm.parser,
+		flagManager:   fm,
 		st:            mockState,
 	}
 
@@ -452,7 +436,7 @@ func TestSaveLocation(t *testing.T) {
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm.parser,
+		flagManager:   fm,
 		st:            mockState,
 	}
 
@@ -496,7 +480,7 @@ func TestSaveOfferings(t *testing.T) {
 	// Create the MenuHandlers instance with the mock store
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm.parser,
+		flagManager:   fm,
 		st:            mockState,
 	}
 
@@ -564,7 +548,7 @@ func TestSaveGender(t *testing.T) {
 			h := &MenuHandlers{
 				userdataStore: store,
 				st:            mockState,
-				flagManager:   fm.parser,
+				flagManager:   fm,
 			}
 
 			expectedResult := resource.Result{}
@@ -595,11 +579,11 @@ func TestSaveTemporaryPin(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_incorrect_pin, _ := fm.parser.GetFlag("flag_incorrect_pin")
+	flag_incorrect_pin, _ := fm.GetFlag("flag_incorrect_pin")
 
 	// Create the MenuHandlers instance with the mock flag manager
 	h := &MenuHandlers{
-		flagManager:   fm.parser,
+		flagManager:   fm,
 		userdataStore: store,
 	}
 
@@ -812,7 +796,7 @@ func TestSetLanguage(t *testing.T) {
 
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager:   fm.parser,
+				flagManager:   fm,
 				userdataStore: store,
 				st:            mockState,
 			}
@@ -846,7 +830,7 @@ func TestResetAllowUpdate(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_allow_update, _ := fm.parser.GetFlag("flag_allow_update")
+	flag_allow_update, _ := fm.GetFlag("flag_allow_update")
 
 	// Define test cases
 	tests := []struct {
@@ -867,7 +851,7 @@ func TestResetAllowUpdate(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager: fm.parser,
+				flagManager: fm,
 			}
 
 			// Call the method
@@ -888,7 +872,7 @@ func TestResetAccountAuthorized(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_account_authorized, _ := fm.parser.GetFlag("flag_account_authorized")
+	flag_account_authorized, _ := fm.GetFlag("flag_account_authorized")
 
 	// Define test cases
 	tests := []struct {
@@ -909,7 +893,7 @@ func TestResetAccountAuthorized(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager: fm.parser,
+				flagManager: fm,
 			}
 
 			// Call the method
@@ -933,8 +917,8 @@ func TestIncorrectPinReset(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_incorrect_pin, _ := fm.parser.GetFlag("flag_incorrect_pin")
-	flag_account_blocked, _ := fm.parser.GetFlag("flag_account_blocked")
+	flag_incorrect_pin, _ := fm.GetFlag("flag_incorrect_pin")
+	flag_account_blocked, _ := fm.GetFlag("flag_account_blocked")
 
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
@@ -992,7 +976,7 @@ func TestIncorrectPinReset(t *testing.T) {
 
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager:   fm.parser,
+				flagManager:   fm,
 				userdataStore: store,
 			}
 
@@ -1014,7 +998,7 @@ func TestResetIncorrectYob(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	flag_incorrect_date_format, _ := fm.parser.GetFlag("flag_incorrect_date_format")
+	flag_incorrect_date_format, _ := fm.GetFlag("flag_incorrect_date_format")
 
 	// Define test cases
 	tests := []struct {
@@ -1035,7 +1019,7 @@ func TestResetIncorrectYob(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create the MenuHandlers instance with the mock flag manager
 			h := &MenuHandlers{
-				flagManager: fm.parser,
+				flagManager: fm,
 			}
 
 			// Call the method
@@ -1073,7 +1057,7 @@ func TestAuthorize(t *testing.T) {
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 		st:             mockState,
 	}
 
@@ -1141,12 +1125,12 @@ func TestVerifyYob(t *testing.T) {
 	// Create required mocks
 	mockAccountService := new(mocks.MockAccountService)
 	mockState := state.NewState(16)
-	flag_incorrect_date_format, _ := fm.parser.GetFlag("flag_incorrect_date_format")
+	flag_incorrect_date_format, _ := fm.GetFlag("flag_incorrect_date_format")
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
 
 	h := &MenuHandlers{
 		accountService: mockAccountService,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 		st:             mockState,
 	}
 
@@ -1206,14 +1190,14 @@ func TestVerifyCreatePin(t *testing.T) {
 	mockAccountService := new(mocks.MockAccountService)
 	mockState := state.NewState(16)
 
-	flag_valid_pin, _ := fm.parser.GetFlag("flag_valid_pin")
-	flag_pin_mismatch, _ := fm.parser.GetFlag("flag_pin_mismatch")
-	flag_pin_set, _ := fm.parser.GetFlag("flag_pin_set")
+	flag_valid_pin, _ := fm.GetFlag("flag_valid_pin")
+	flag_pin_mismatch, _ := fm.GetFlag("flag_pin_mismatch")
+	flag_pin_set, _ := fm.GetFlag("flag_pin_set")
 
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 		st:             mockState,
 	}
 
@@ -1239,13 +1223,20 @@ func TestVerifyCreatePin(t *testing.T) {
 		},
 	}
 
+	// Hash the correct PIN
+	hashedPIN, err := pin.HashPIN("1234")
+	if err != nil {
+		logg.ErrorCtxf(ctx, "failed to hash temporaryPin", "error", err)
+		t.Fatal(err)
+	}
+
+	err = store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(hashedPIN))
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err = store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte("1234"))
-			if err != nil {
-				t.Fatal(err)
-			}
-
 			// Call the method under test
 			res, err := h.VerifyCreatePin(ctx, "verify_create_pin", []byte(tt.input))
 
@@ -1307,7 +1298,7 @@ func TestCheckAccountStatus(t *testing.T) {
 			h := &MenuHandlers{
 				userdataStore:  store,
 				accountService: mockAccountService,
-				flagManager:    fm.parser,
+				flagManager:    fm,
 			}
 
 			err = store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(tt.publicKey))
@@ -1347,7 +1338,7 @@ func TestTransactionReset(t *testing.T) {
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 	}
 	tests := []struct {
 		name           string
@@ -1387,14 +1378,14 @@ func TestResetTransactionAmount(t *testing.T) {
 		t.Logf(err.Error())
 	}
 
-	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
+	flag_invalid_amount, _ := fm.GetFlag("flag_invalid_amount")
 
 	mockAccountService := new(mocks.MockAccountService)
 
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 	}
 
 	tests := []struct {
@@ -1431,14 +1422,14 @@ func TestInitiateTransaction(t *testing.T) {
 	if err != nil {
 		t.Logf(err.Error())
 	}
-	account_authorized_flag, _ := fm.parser.GetFlag("flag_account_authorized")
+	account_authorized_flag, _ := fm.GetFlag("flag_account_authorized")
 
 	mockAccountService := new(mocks.MockAccountService)
 
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 	}
 
 	tests := []struct {
@@ -1524,7 +1515,7 @@ func TestQuit(t *testing.T) {
 	if err != nil {
 		t.Logf(err.Error())
 	}
-	flag_account_authorized, _ := fm.parser.GetFlag("flag_account_authorized")
+	flag_account_authorized, _ := fm.GetFlag("flag_account_authorized")
 
 	mockAccountService := new(mocks.MockAccountService)
 
@@ -1534,7 +1525,7 @@ func TestQuit(t *testing.T) {
 
 	h := &MenuHandlers{
 		accountService: mockAccountService,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 	}
 	tests := []struct {
 		name           string
@@ -1577,14 +1568,14 @@ func TestValidateAmount(t *testing.T) {
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
-	flag_invalid_amount, _ := fm.parser.GetFlag("flag_invalid_amount")
+	flag_invalid_amount, _ := fm.GetFlag("flag_invalid_amount")
 
 	mockAccountService := new(mocks.MockAccountService)
 
 	h := &MenuHandlers{
 		userdataStore:  store,
 		accountService: mockAccountService,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 	}
 	tests := []struct {
 		name           string
@@ -1651,8 +1642,8 @@ func TestValidateRecipient(t *testing.T) {
 	ctx, store := InitializeTestStore(t)
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
-	flag_invalid_recipient, _ := fm.parser.GetFlag("flag_invalid_recipient")
-	flag_invalid_recipient_with_invite, _ := fm.parser.GetFlag("flag_invalid_recipient_with_invite")
+	flag_invalid_recipient, _ := fm.GetFlag("flag_invalid_recipient")
+	flag_invalid_recipient_with_invite, _ := fm.GetFlag("flag_invalid_recipient_with_invite")
 
 	// Define test cases
 	tests := []struct {
@@ -1704,7 +1695,7 @@ func TestValidateRecipient(t *testing.T) {
 			mockAccountService := new(mocks.MockAccountService)
 			// Create the MenuHandlers instance
 			h := &MenuHandlers{
-				flagManager:    fm.parser,
+				flagManager:    fm,
 				userdataStore:  store,
 				accountService: mockAccountService,
 			}
@@ -1867,10 +1858,10 @@ func TestVerifyNewPin(t *testing.T) {
 
 	fm, _ := NewFlagManager(flagsPath)
 
-	flag_valid_pin, _ := fm.parser.GetFlag("flag_valid_pin")
+	flag_valid_pin, _ := fm.GetFlag("flag_valid_pin")
 	mockAccountService := new(mocks.MockAccountService)
 	h := &MenuHandlers{
-		flagManager:    fm.parser,
+		flagManager:    fm,
 		accountService: mockAccountService,
 	}
 	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
@@ -1913,24 +1904,24 @@ func TestConfirmPin(t *testing.T) {
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
 	fm, _ := NewFlagManager(flagsPath)
-	flag_pin_mismatch, _ := fm.parser.GetFlag("flag_pin_mismatch")
+	flag_pin_mismatch, _ := fm.GetFlag("flag_pin_mismatch")
 	mockAccountService := new(mocks.MockAccountService)
 	h := &MenuHandlers{
 		userdataStore:  store,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 		accountService: mockAccountService,
 	}
 
 	tests := []struct {
 		name           string
 		input          []byte
-		temporarypin   []byte
+		temporarypin   string
 		expectedResult resource.Result
 	}{
 		{
 			name:         "Test with correct pin confirmation",
 			input:        []byte("1234"),
-			temporarypin: []byte("1234"),
+			temporarypin: "1234",
 			expectedResult: resource.Result{
 				FlagReset: []uint32{flag_pin_mismatch},
 			},
@@ -1938,14 +1929,21 @@ func TestConfirmPin(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			// Hash the PIN
+			hashedPIN, err := pin.HashPIN(tt.temporarypin)
+			if err != nil {
+				logg.ErrorCtxf(ctx, "failed to hash temporaryPin", "error", err)
+				t.Fatal(err)
+			}
+
 			// Set up the expected behavior of the mock
-			err := store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(tt.temporarypin))
+			err = store.WriteEntry(ctx, sessionId, storedb.DATA_TEMPORARY_VALUE, []byte(hashedPIN))
 			if err != nil {
 				t.Fatal(err)
 			}
 
 			//Call the function under test
-			res, _ := h.ConfirmPinChange(ctx, "confirm_pin_change", tt.temporarypin)
+			res, _ := h.ConfirmPinChange(ctx, "confirm_pin_change", tt.input)
 
 			//Assert that the result set to content is what was expected
 			assert.Equal(t, res, tt.expectedResult, "Result should contain flags set according to user input")
@@ -2047,7 +2045,7 @@ func TestSetDefaultVoucher(t *testing.T) {
 			h := &MenuHandlers{
 				userdataStore:  store,
 				accountService: mockAccountService,
-				flagManager:    fm.parser,
+				flagManager:    fm,
 			}
 
 			err := store.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(publicKey))
@@ -2155,7 +2153,7 @@ func TestViewVoucher(t *testing.T) {
 
 	h := &MenuHandlers{
 		userdataStore: store,
-		flagManager:   fm.parser,
+		flagManager:   fm,
 		prefixDb:      spdb,
 	}
 
@@ -2228,7 +2226,7 @@ func TestGetVoucherDetails(t *testing.T) {
 
 	h := &MenuHandlers{
 		userdataStore:  store,
-		flagManager:    fm.parser,
+		flagManager:    fm,
 		accountService: mockAccountService,
 	}
 	err = store.WriteEntry(ctx, sessionId, storedb.DATA_ACTIVE_ADDRESS, []byte(tokA_AAddress))

handlers/local.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"strings"
 
-	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/persist"
@@ -12,47 +11,35 @@ import (
 
 	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 )
 
 type HandlerService interface {
 	GetHandler() (*application.MenuHandlers, error)
 }
 
-func getParser(fp string, debug bool) (*asm.FlagParser, error) {
-	flagParser := asm.NewFlagParser().WithDebug()
-	_, err := flagParser.Load(fp)
-	if err != nil {
-		return nil, err
-	}
-	return flagParser, nil
-}
-
 type LocalHandlerService struct {
-	Parser        *asm.FlagParser
+	Parser        *application.FlagManager
 	DbRs          *resource.DbResource
 	Pe            *persist.Persister
 	UserdataStore *db.Db
-	AdminStore    *store.AdminStore
 	Cfg           engine.Config
 	Rs            resource.Resource
 }
 
 func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
-	parser, err := getParser(fp, debug)
+	parser, err := application.NewFlagManager(fp)
 	if err != nil {
 		return nil, err
 	}
-	adminstore, err := store.NewAdminStore(ctx, "admin_numbers")
-	if err != nil {
-		return nil, err
+	if debug {
+		parser.SetDebug()
 	}
+
 	return &LocalHandlerService{
-		Parser:     parser,
-		DbRs:       dbResource,
-		AdminStore: adminstore,
-		Cfg:        cfg,
-		Rs:         rs,
+		Parser: parser,
+		DbRs:   dbResource,
+		Cfg:    cfg,
+		Rs:     rs,
 	}, nil
 }
 
@@ -69,12 +56,13 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 		return strings.ReplaceAll(input, ":", ls.Cfg.MenuSeparator)
 	}
 
-	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService, replaceSeparatorFunc)
+	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, accountService, replaceSeparatorFunc)
 	if err != nil {
 		return nil, err
 	}
 	//appHandlers = appHandlers.WithPersister(ls.Pe)
 	appHandlers.SetPersister(ls.Pe)
+	ls.DbRs.AddLocalFunc("check_blocked_status", appHandlers.CheckBlockedStatus)
 	ls.DbRs.AddLocalFunc("set_language", appHandlers.SetLanguage)
 	ls.DbRs.AddLocalFunc("create_account", appHandlers.CreateAccount)
 	ls.DbRs.AddLocalFunc("save_temporary_pin", appHandlers.SaveTemporaryPin)

internal/cmd/cmd.go

@@ -0,0 +1,98 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("cmd").WithContextKey("SessionId")
+)
+
+type Cmd struct {
+	sessionId string
+	conn storage.ConnData
+	flagParser *application.FlagManager
+	cmd int
+	enable bool
+	exec func(ctx context.Context, ss storage.StorageService) error
+}
+
+func NewCmd(sessionId string, flagParser *application.FlagManager) *Cmd {
+	return &Cmd{
+		sessionId: sessionId,
+		flagParser: flagParser,
+	}
+}
+
+func (c *Cmd) Exec(ctx context.Context, ss storage.StorageService) error {
+	return c.exec(ctx, ss)
+}
+
+func (c *Cmd) execAdmin(ctx context.Context, ss storage.StorageService) error {
+	pe, err := ss.GetPersister(ctx)
+	if err != nil {
+		return err
+	}
+	err = pe.Load(c.sessionId)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		err := pe.Save(c.sessionId)
+		if err != nil {
+			logg.ErrorCtxf(ctx, "failed persister save: %v", err)
+		}
+	}()
+
+	st := pe.GetState()
+	flag, err := c.flagParser.GetFlag("flag_admin_privilege")
+	if err != nil {
+		return err
+	}
+	if c.enable {
+		logg.InfoCtxf(ctx, "setting admin flag", "flag", flag)
+		st.SetFlag(flag)
+	} else {
+		st.ResetFlag(flag)
+	}
+	return nil
+}
+
+func (c *Cmd) parseCmdAdmin(cmd string, param string, more []string) (bool, error) {
+	if cmd == "admin" {
+		if param == "1" {
+			c.enable = true
+		} else if param != "0" {
+			return false, fmt.Errorf("invalid parameter: %v", param)
+		}
+		c.exec = c.execAdmin
+		return true, nil
+	}
+	return false, nil
+}
+
+func (c *Cmd) Parse(args []string) error {
+	if len(args) < 2 {
+		return fmt.Errorf("Wrong number of arguments: %v", args)
+	}
+	cmd := args[0]
+	param := args[1]
+	args = args[2:]
+
+	r, err := c.parseCmdAdmin(cmd, param, args)
+	if err != nil {
+		return err
+	}
+	if r {
+		return nil
+	}
+
+	return fmt.Errorf("unknown subcommand: %s", cmd)
+}
+
+

menutraversal_test/menu_traversal_test.go

@@ -10,11 +10,13 @@ import (
 	"testing"
 
 	"github.com/gofrs/uuid"
+	"git.defalsify.org/vise.git/logging"
 	"git.grassecon.net/grassrootseconomics/visedriver/testutil/driver"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil"
 )
 
 var (
+	logg = logging.NewVanilla().WithDomain("menutraversaltest")
 	testData  = driver.ReadData()
 	sessionID string
 	src       = rand.NewSource(42)
@@ -22,9 +24,6 @@ var (
 )
 
 var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")
-var database = flag.String("db", "gdbm", "Specify the database (gdbm or postgres)")
-var connStr = flag.String("conn", ".test_state", "connection string")
-var dbSchema = flag.String("schema", "test", "Specify the database schema (default test)")
 
 func GenerateSessionId() string {
 	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
@@ -80,12 +79,7 @@ func extractSendAmount(response []byte) string {
 }
 
 func TestMain(m *testing.M) {
-	// Parse the flags
-	flag.Parse()
 	sessionID = GenerateSessionId()
-	// set the db
-	testutil.SetDatabase(*database, *connStr, *dbSchema)
-
 	// Cleanup the db after tests
 	defer testutil.CleanDatabase()
 
@@ -100,7 +94,8 @@ func TestAccountCreationSuccessful(t *testing.T) {
 	for _, session := range sessions {
 		groups := driver.FilterGroupsByName(session.Groups, "account_creation_successful")
 		for _, group := range groups {
-			for _, step := range group.Steps {
+			for i, step := range group.Steps {
+				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
 				cont, err := en.Exec(ctx, []byte(step.Input))
 				if err != nil {
 					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
@@ -142,7 +137,8 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 	for _, session := range sessions {
 		groups := driver.FilterGroupsByName(session.Groups, "account_creation_reject_terms")
 		for _, group := range groups {
-			for _, step := range group.Steps {
+			for i, step := range group.Steps {
+				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
 				cont, err := en.Exec(ctx, []byte(step.Input))
 				if err != nil {
 					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
@@ -177,7 +173,8 @@ func TestMainMenuHelp(t *testing.T) {
 	for _, session := range sessions {
 		groups := driver.FilterGroupsByName(session.Groups, "main_menu_help")
 		for _, group := range groups {
-			for _, step := range group.Steps {
+			for i, step := range group.Steps {
+				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
 				cont, err := en.Exec(ctx, []byte(step.Input))
 				if err != nil {
 					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)

services/local.go

@@ -37,7 +37,7 @@ func (d *localEmitter) emit(ctx context.Context, msg apievent.Msg) error {
 	return err
 }
 
-func New(ctx context.Context, storageService storage.StorageService, conn storage.ConnData) remote.AccountService {
+func New(ctx context.Context, storageService storage.StorageService) remote.AccountService {
 	svc := devremote.NewDevAccountService(ctx, storageService)
 	svc = svc.WithAutoVoucher(ctx, "FOO", 42)
 	eu := event.NewEventsUpdater(svc, storageService)

services/registration/Makefile

@@ -4,8 +4,8 @@ TXTS = $(wildcard ./*.txt.orig)
 VISE_PATH := ../../go-vise
 
 # Rule to build .bin files from .vis files
-%.vis:
-	go run  $(VISE_PATH)/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
+%.vis: buildasm
+	./vise-asm -f pp.csv $(basename $@).vis > $(basename $@).bin
 	@echo "Built $(basename $@).bin from $(basename $@).vis"
 
 # Rule to copy .orig files to .txt
@@ -19,5 +19,10 @@ all: $(INPUTS) $(TXTS)
 
 clean: 
 	rm -vf *.bin
+	rm -vf ./vise-asm
+
+buildasm:
+	go build -v -o ./vise-asm $(VISE_PATH)/dev/asm/main.go
+
 
 .PHONY: clean

services/registration/account_pending

@@ -1 +1 @@
-Your account is still being created.
+Your account is still being created. For more help, please call: 0757628885

services/registration/account_pending_swa

@@ -1 +1 @@
-Akaunti yako bado inatengenezwa
+Akaunti yako bado inatengenezwa. Kwa usaidizi zaidi, piga: 0757628885

services/registration/root.vis

@@ -1,9 +1,11 @@
+LOAD check_blocked_status 1
+RELOAD check_blocked_status
 CATCH blocked_account flag_account_blocked 1
 CATCH select_language flag_language_set 0
 CATCH terms flag_account_created 0
 LOAD check_account_status 0
 RELOAD check_account_status
-CATCH api_failure  flag_api_call_error  1
+CATCH api_failure flag_api_call_error  1
 CATCH account_pending flag_account_pending 1
 CATCH create_pin flag_pin_set 0
 CATCH main flag_account_success 1

services/registration/send.vis

@@ -3,7 +3,7 @@ RELOAD transaction_reset
 CATCH no_voucher flag_no_active_voucher 1
 MOUT back 0
 HALT
-LOAD validate_recipient 20
+LOAD validate_recipient 50
 RELOAD validate_recipient
 CATCH invalid_recipient flag_invalid_recipient 1
 CATCH invite_recipient flag_invalid_recipient_with_invite 1