clean -up tests

.env.example

@@ -1,18 +0,0 @@
-#Serve Http
-PORT=7123
-HOST=127.0.0.1
-
-#PostgreSQL
-DB_HOST=localhost
-DB_USER=postgres
-DB_PASSWORD=strongpass
-DB_NAME=urdt_ussd
-DB_PORT=5432
-DB_SSLMODE=disable
-DB_TIMEZONE=Africa/Nairobi
-
-#External API Calls
-CREATE_ACCOUNT_URL=http://localhost:5003/api/v2/account/create
-TRACK_STATUS_URL=https://custodial.sarafu.africa/api/track/
-BALANCE_URL=https://custodial.sarafu.africa/api/account/status/
-TRACK_URL=http://localhost:5003/api/v2/account/status

.gitignore

@@ -4,5 +4,3 @@ go.work*
 **/*/*.bin
 **/*/.state/
 cmd/.state/
-id_*
-*.gdbm

cmd/africastalking/main.go

@@ -12,30 +12,27 @@ import (
 	"strings"
 	"syscall"
 
+	"git.defalsify.org/vise.git/asm"
+	"git.defalsify.org/vise.git/db"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	gdbmdb "git.defalsify.org/vise.git/db/gdbm"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/initializers"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
+	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
-	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
 var (
-	logg      = logging.NewVanilla()
+	logg = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
 )
 
-func init() {
-	initializers.LoadEnvVariables()
-}
+type atRequestParser struct {}
 
-type atRequestParser struct{}
-
-func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
+func(arp *atRequestParser) GetSessionId(rq any) (string, error) {
 	rqv, ok := rq.(*http.Request)
 	if !ok {
 		return "", handlers.ErrInvalidRequest
@@ -52,7 +49,7 @@ func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
 	return phoneNumber, nil
 }
 
-func (arp *atRequestParser) GetInput(rq any) ([]byte, error) {
+func(arp *atRequestParser) GetInput(rq any) ([]byte, error) {
 	rqv, ok := rq.(*http.Request)
 	if !ok {
 		return nil, handlers.ErrInvalidRequest
@@ -71,55 +68,148 @@ func (arp *atRequestParser) GetInput(rq any) ([]byte, error) {
 	return []byte(parts[len(parts)-1]), nil
 }
 
-func main() {
-	config.LoadConfig()
 
+func getFlags(fp string, debug bool) (*asm.FlagParser, error) {
+	flagParser := asm.NewFlagParser().WithDebug()
+	_, err := flagParser.Load(fp)
+	if err != nil {
+		return nil, err
+	}
+	return flagParser, nil
+}
+
+func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore db.Db) (*ussd.Handlers, error) {
+
+	ussdHandlers, err := ussd.NewHandlers(appFlags, userdataStore)
+	if err != nil {
+		return nil, err
+	}
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
+	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
+	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
+	rs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
+	rs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
+	rs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
+	rs.AddLocalFunc("quit", ussdHandlers.Quit)
+	rs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
+	rs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
+	rs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
+	rs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
+	rs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
+	rs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
+	rs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
+	rs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
+	rs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
+	rs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
+	rs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
+	rs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
+	rs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
+	rs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
+	rs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
+	rs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
+	rs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
+	rs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
+	rs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
+	rs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
+	rs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
+	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
+	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
+	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
+
+	return ussdHandlers, nil
+}
+
+func ensureDbDir(dbDir string) error {
+	err := os.MkdirAll(dbDir, 0700)
+	if err != nil {
+		return fmt.Errorf("state dir create exited with error: %v\n", err)
+	}
+	return nil
+}
+
+func getStateStore(dbDir string, ctx context.Context) (db.Db, error) {
+	store := gdbmdb.NewGdbmDb()
+	storeFile := path.Join(dbDir, "state.gdbm")
+	store.Connect(ctx, storeFile)
+	return store, nil
+}
+
+func getUserdataDb(dbDir string, ctx context.Context) db.Db {
+	store := gdbmdb.NewGdbmDb()
+	storeFile := path.Join(dbDir, "userdata.gdbm")
+	store.Connect(ctx, storeFile)
+	
+	return store
+}
+
+func getResource(resourceDir string, ctx context.Context) (resource.Resource, error) {
+	store := fsdb.NewFsDb()
+	err := store.Connect(ctx, resourceDir)
+	if err != nil {
+		return nil, err
+	}
+	rfs := resource.NewDbResource(store)
+	return rfs, nil
+}
+
+
+func main() {
 	var dbDir string
 	var resourceDir string
 	var size uint
-	var database string
 	var engineDebug bool
+	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&database, "db", "gdbm", "database to be used")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
+	flag.StringVar(&host, "h", "127.0.0.1", "http host")
+	flag.UintVar(&port, "p", 7123, "http port")
 	flag.Parse()
 
-	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
+	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir,  "outputsize", size)
 
 	ctx := context.Background()
-	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")
+	flagParser, err := getFlags(pfp, true)
+
+	if err != nil {
+		os.Exit(1)
+	}
 
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
+	}
+	if stateDebug {
+		cfg.StateDebug = true
 	}
-
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-	rs, err := menuStorageService.GetResource(ctx)
+	rs, err := getResource(resourceDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = menuStorageService.EnsureDbDir()
+	err = ensureDbDir(dbDir)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
+	userdataStore := getUserdataDb(dbDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -131,22 +221,13 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-	lhs.SetDataStore(&userdataStore)
-
+	hl, err := getHandler(flagParser, dbResource, userdataStore)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	accountService := server.AccountService{}
-	hl, err := lhs.GetHandler(&accountService)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	stateStore, err := menuStorageService.GetStateStore(ctx)
+	stateStore, err := getStateStore(dbDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -157,7 +238,7 @@ func main() {
 	bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
 	sh := httpserver.NewATSessionHandler(bsh)
 	s := &http.Server{
-		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
+		Addr: fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: sh,
 	}
 	s.RegisterOnShutdown(sh.Shutdown)

cmd/async/main.go

@@ -9,90 +9,179 @@ import (
 	"path"
 	"syscall"
 
+	"git.defalsify.org/vise.git/asm"
+	"git.defalsify.org/vise.git/db"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	gdbmdb "git.defalsify.org/vise.git/db/gdbm"
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
+	"git.defalsify.org/vise.git/logging"
 
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/initializers"
+	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
 var (
-	logg      = logging.NewVanilla()
+	logg = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
 )
 
-func init() {
-	initializers.LoadEnvVariables()
-}
-
 type asyncRequestParser struct {
 	sessionId string
-	input     []byte
+	input []byte
 }
 
-func (p *asyncRequestParser) GetSessionId(r any) (string, error) {
+func(p *asyncRequestParser) GetSessionId(r any) (string, error) {
 	return p.sessionId, nil
 }
 
-func (p *asyncRequestParser) GetInput(r any) ([]byte, error) {
+func(p *asyncRequestParser) GetInput(r any) ([]byte, error) {
 	return p.input, nil
 }
 
-func main() {
-	config.LoadConfig()
+func getFlags(fp string, debug bool) (*asm.FlagParser, error) {
+	flagParser := asm.NewFlagParser().WithDebug()
+	_, err := flagParser.Load(fp)
+	if err != nil {
+		return nil, err
+	}
+	return flagParser, nil
+}
 
+func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore db.Db) (*ussd.Handlers, error) {
+
+	ussdHandlers, err := ussd.NewHandlers(appFlags, userdataStore)
+	if err != nil {
+		return nil, err
+	}
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
+	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
+	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
+	rs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
+	rs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
+	rs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
+	rs.AddLocalFunc("quit", ussdHandlers.Quit)
+	rs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
+	rs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
+	rs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
+	rs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
+	rs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
+	rs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
+	rs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
+	rs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
+	rs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
+	rs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
+	rs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
+	rs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
+	rs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
+	rs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
+	rs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
+	rs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
+	rs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
+	rs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
+	rs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
+	rs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
+	rs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
+	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
+	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
+	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
+
+	return ussdHandlers, nil
+}
+
+func ensureDbDir(dbDir string) error {
+	err := os.MkdirAll(dbDir, 0700)
+	if err != nil {
+		return fmt.Errorf("state dir create exited with error: %v\n", err)
+	}
+	return nil
+}
+
+func getStateStore(dbDir string, ctx context.Context) (db.Db, error) {
+	store := gdbmdb.NewGdbmDb()
+	storeFile := path.Join(dbDir, "state.gdbm")
+	store.Connect(ctx, storeFile)
+	return store, nil
+}
+
+func getUserdataDb(dbDir string, ctx context.Context) db.Db {
+	store := gdbmdb.NewGdbmDb()
+	storeFile := path.Join(dbDir, "userdata.gdbm")
+	store.Connect(ctx, storeFile)
+	
+	return store
+}
+
+func getResource(resourceDir string, ctx context.Context) (resource.Resource, error) {
+	store := fsdb.NewFsDb()
+	err := store.Connect(ctx, resourceDir)
+	if err != nil {
+		return nil, err
+	}
+	rfs := resource.NewDbResource(store)
+	return rfs, nil
+}
+
+
+func main() {
 	var sessionId string
 	var dbDir string
 	var resourceDir string
 	var size uint
-	var database string
 	var engineDebug bool
+	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&database, "db", "gdbm", "database to be used")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
+	flag.StringVar(&host, "h", "127.0.0.1", "http host")
+	flag.UintVar(&port, "p", 7123, "http port")
 	flag.Parse()
 
-	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)
+	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir,  "outputsize", size, "sessionId", sessionId)
 
 	ctx := context.Background()
-	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")
+	flagParser, err := getFlags(pfp, true)
+
+	if err != nil {
+		os.Exit(1)
+	}
 
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
+	}
+	if stateDebug {
+		cfg.StateDebug = true
 	}
-
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-	rs, err := menuStorageService.GetResource(ctx)
+	rs, err := getResource(resourceDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = menuStorageService.EnsureDbDir()
+	err = ensureDbDir(dbDir)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
+	userdataStore := getUserdataDb(dbDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -104,17 +193,13 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-	lhs.SetDataStore(&userdataStore)
-	accountService := server.AccountService{}
-
-	hl, err := lhs.GetHandler(&accountService)
+	hl, err := getHandler(flagParser, dbResource, userdataStore)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	stateStore, err := menuStorageService.GetStateStore(ctx)
+	stateStore, err := getStateStore(dbDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -127,7 +212,7 @@ func main() {
 	sh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
 	cfg.SessionId = sessionId
 	rqs := handlers.RequestSession{
-		Ctx:    ctx,
+		Ctx: ctx,
 		Writer: os.Stdout,
 		Config: cfg,
 	}
@@ -147,27 +232,23 @@ func main() {
 	for true {
 		rqs, err = sh.Process(rqs)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in process: %v", "err", err)
 			fmt.Errorf("error in process: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Output(rqs)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in output: %v", "err", err)
 			fmt.Errorf("error in output: %v", err)
 			os.Exit(1)
 		}
 		rqs, err = sh.Reset(rqs)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in reset: %v", "err", err)
 			fmt.Errorf("error in reset: %v", err)
 			os.Exit(1)
 		}
 		fmt.Println("")
 		_, err = fmt.Scanln(&rqs.Input)
 		if err != nil {
-			logg.ErrorCtxf(ctx, "error in input", "err", err)
-			fmt.Errorf("error in input: %v", err)
+		fmt.Errorf("error in input: %v", err)
 			os.Exit(1)
 		}
 	}

cmd/http/main.go

@@ -11,76 +11,165 @@ import (
 	"strconv"
 	"syscall"
 
+	"git.defalsify.org/vise.git/asm"
+	"git.defalsify.org/vise.git/db"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	gdbmdb "git.defalsify.org/vise.git/db/gdbm"
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
+	"git.defalsify.org/vise.git/logging"
 
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/initializers"
+	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
-	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
 var (
-	logg      = logging.NewVanilla()
+	logg = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
 )
 
-func init() {
-	initializers.LoadEnvVariables()
+func getFlags(fp string, debug bool) (*asm.FlagParser, error) {
+	flagParser := asm.NewFlagParser().WithDebug()
+	_, err := flagParser.Load(fp)
+	if err != nil {
+		return nil, err
+	}
+	return flagParser, nil
 }
 
-func main() {
-	config.LoadConfig()
+func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore db.Db) (*ussd.Handlers, error) {
 
+	ussdHandlers, err := ussd.NewHandlers(appFlags, userdataStore)
+	if err != nil {
+		return nil, err
+	}
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
+	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
+	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
+	rs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
+	rs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
+	rs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
+	rs.AddLocalFunc("quit", ussdHandlers.Quit)
+	rs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
+	rs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
+	rs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
+	rs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
+	rs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
+	rs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
+	rs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
+	rs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
+	rs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
+	rs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
+	rs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
+	rs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
+	rs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
+	rs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
+	rs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
+	rs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
+	rs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
+	rs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
+	rs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
+	rs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
+	rs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
+	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
+	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
+	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
+
+	return ussdHandlers, nil
+}
+
+func ensureDbDir(dbDir string) error {
+	err := os.MkdirAll(dbDir, 0700)
+	if err != nil {
+		return fmt.Errorf("state dir create exited with error: %v\n", err)
+	}
+	return nil
+}
+
+func getStateStore(dbDir string, ctx context.Context) (db.Db, error) {
+	store := gdbmdb.NewGdbmDb()
+	storeFile := path.Join(dbDir, "state.gdbm")
+	store.Connect(ctx, storeFile)
+	return store, nil
+}
+
+func getUserdataDb(dbDir string, ctx context.Context) db.Db {
+	store := gdbmdb.NewGdbmDb()
+	storeFile := path.Join(dbDir, "userdata.gdbm")
+	store.Connect(ctx, storeFile)
+	
+	return store
+}
+
+func getResource(resourceDir string, ctx context.Context) (resource.Resource, error) {
+	store := fsdb.NewFsDb()
+	err := store.Connect(ctx, resourceDir)
+	if err != nil {
+		return nil, err
+	}
+	rfs := resource.NewDbResource(store)
+	return rfs, nil
+}
+
+
+func main() {
 	var dbDir string
 	var resourceDir string
 	var size uint
-	var database string
 	var engineDebug bool
+	var stateDebug bool
 	var host string
 	var port uint
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
 	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&database, "db", "gdbm", "database to be used")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
+	flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
-	flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
+	flag.StringVar(&host, "h", "127.0.0.1", "http host")
+	flag.UintVar(&port, "p", 7123, "http port")
 	flag.Parse()
 
-	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
+	logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir,  "outputsize", size)
 
 	ctx := context.Background()
-	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")
+	flagParser, err := getFlags(pfp, true)
+
+	if err != nil {
+		os.Exit(1)
+	}
 
 	cfg := engine.Config{
 		Root:       "root",
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
+	}
+	if stateDebug {
+		cfg.StateDebug = true
 	}
-
 	if engineDebug {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-	rs, err := menuStorageService.GetResource(ctx)
+	rs, err := getResource(resourceDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	err = menuStorageService.EnsureDbDir()
+	err = ensureDbDir(dbDir)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
+	userdataStore := getUserdataDb(dbDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -92,21 +181,13 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-	lhs.SetDataStore(&userdataStore)
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	accountService := server.AccountService{}
-	hl, err := lhs.GetHandler(&accountService)
+	hl, err := getHandler(flagParser, dbResource, userdataStore)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	stateStore, err := menuStorageService.GetStateStore(ctx)
+	stateStore, err := getStateStore(dbDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -117,7 +198,7 @@ func main() {
 	bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
 	sh := httpserver.ToSessionHandler(bsh)
 	s := &http.Server{
-		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
+		Addr: fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: sh,
 	}
 	s.RegisterOnShutdown(sh.Shutdown)

cmd/main.go

@@ -7,14 +7,15 @@ import (
 	"os"
 	"path"
 
+	"git.defalsify.org/vise.git/asm"
+	"git.defalsify.org/vise.git/db"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	gdbmdb "git.defalsify.org/vise.git/db/gdbm"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/initializers"
-	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-	"git.grassecon.net/urdt/ussd/internal/storage"
+	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
 )
 
 var (
@@ -22,22 +23,114 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
-func init() {
-	initializers.LoadEnvVariables()
+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
+}
+
+func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, pe *persist.Persister, userdataStore db.Db) (*ussd.Handlers, error) {
+
+	ussdHandlers, err := ussd.NewHandlers(appFlags, userdataStore)
+	if err != nil {
+		return nil, err
+	}
+	ussdHandlers = ussdHandlers.WithPersister(pe)
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
+	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
+	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
+	rs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
+	rs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
+	rs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
+	rs.AddLocalFunc("quit", ussdHandlers.Quit)
+	rs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
+	rs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
+	rs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
+	rs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
+	rs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
+	rs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
+	rs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
+	rs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
+	rs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
+	rs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
+	rs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
+	rs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
+	rs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
+	rs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
+	rs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
+	rs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
+	rs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
+	rs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
+	rs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
+	rs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
+	rs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
+	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
+	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
+	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
+
+	return ussdHandlers, nil
+}
+
+func ensureDbDir(dbDir string) error {
+	err := os.MkdirAll(dbDir, 0700)
+	if err != nil {
+		return fmt.Errorf("state dir create exited with error: %v\n", err)
+	}
+	return nil
+}
+
+func getPersister(dbDir string, ctx context.Context) (*persist.Persister, error) {
+	err := ensureDbDir(dbDir)
+	if err != nil {
+		return nil, err
+	}
+	store := gdbmdb.NewGdbmDb()
+	storeFile := path.Join(dbDir, "state.gdbm")
+	store.Connect(ctx, storeFile)
+	pr := persist.NewPersister(store)
+	return pr, nil
+}
+
+func getUserdataDb(dbDir string, ctx context.Context) db.Db {
+	store := gdbmdb.NewGdbmDb()
+	storeFile := path.Join(dbDir, "userdata.gdbm")
+	store.Connect(ctx, storeFile)
+
+	return store
+}
+
+func getResource(resourceDir string, ctx context.Context) (resource.Resource, error) {
+	store := fsdb.NewFsDb()
+	err := store.Connect(ctx, resourceDir)
+	if err != nil {
+		return nil, err
+	}
+	rfs := resource.NewDbResource(store)
+	return rfs, nil
+}
+
+func getEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) *engine.DefaultEngine {
+	en := engine.NewEngine(cfg, rs)
+	en = en.WithPersister(pr)
+	return en
 }
 
 func main() {
-	config.LoadConfig()
-
 	var dbDir string
 	var size uint
 	var sessionId string
-	var database string
-	var engineDebug bool
+	var debug bool
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&database, "db", "gdbm", "database to be used")
 	flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.BoolVar(&debug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.Parse()
 
@@ -45,38 +138,33 @@ func main() {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")
+	flagParser, err := getParser(pfp, true)
+
+	if err != nil {
+		os.Exit(1)
+	}
 
 	cfg := engine.Config{
 		Root:       "root",
 		SessionId:  sessionId,
 		OutputSize: uint32(size),
-		FlagCount:  uint32(128),
+		FlagCount:  uint32(16),
 	}
 
-	resourceDir := scriptDir
-	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-
-	err := menuStorageService.EnsureDbDir()
+	rs, err := getResource(scriptDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	rs, err := menuStorageService.GetResource(ctx)
+	pe, err := getPersister(dbDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	pe, err := menuStorageService.GetPersister(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	userdatastore, err := menuStorageService.GetUserdataDb(ctx)
+	store := getUserdataDb(dbDir, ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -88,29 +176,25 @@ func main() {
 		os.Exit(1)
 	}
 
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-	lhs.SetDataStore(&userdatastore)
-	lhs.SetPersister(pe)
-
+	hl, err := getHandler(flagParser, dbResource, pe, store)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	accountService := server.AccountService{}
-	hl, err := lhs.GetHandler(&accountService)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	en := lhs.GetEngine()
+	en := getEngine(cfg, rs, pe)
 	en = en.WithFirst(hl.Init)
-	if engineDebug {
+	if debug {
 		en = en.WithDebug(nil)
 	}
 
-	err = engine.Loop(ctx, en, os.Stdin, os.Stdout, nil)
+	_, err = en.Init(ctx)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "engine init exited with error: %v\n", err)
+		os.Exit(1)
+	}
+
+	err = engine.Loop(ctx, en, os.Stdin, os.Stdout)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "loop exited with error: %v\n", err)
 		os.Exit(1)

common/hex.go

@@ -1,18 +0,0 @@
-package common
-
-import (
-	"encoding/hex"
-)
-
-func NormalizeHex(s string) (string, error) {
-	if len(s) >= 2 {
-		if s[:2] == "0x" {
-			s = s[2:]
-		}
-	}
-	r, err := hex.DecodeString(s)
-	if err != nil {
-		return "", err
-	}
-	return hex.EncodeToString(r), nil
-}

config/config.go

@@ -1,18 +1,10 @@
 package config
 
-import "git.grassecon.net/urdt/ussd/initializers"
 
-var (
-	CreateAccountURL string
-	TrackStatusURL   string
-	BalanceURL       string
-    TrackURL         string
+
+const (
+    CreateAccountURL = "https://custodial.sarafu.africa/api/account/create"
+    TrackStatusURL   = "https://custodial.sarafu.africa/api/track/"
+    BalanceURL       = "https://custodial.sarafu.africa/api/account/status/"
 )
 
-// LoadConfig initializes the configuration values after environment variables are loaded.
-func LoadConfig() {
-	CreateAccountURL = initializers.GetEnv("CREATE_ACCOUNT_URL", "http://localhost:5003/api/v2/account/create")
-	TrackStatusURL = initializers.GetEnv("TRACK_STATUS_URL", "https://custodial.sarafu.africa/api/track/")
-	BalanceURL = initializers.GetEnv("BALANCE_URL", "https://custodial.sarafu.africa/api/account/status/")
-    TrackURL = initializers.GetEnv("TRACK_URL", "http://localhost:5003/api/v2/account/status")
-}

go.mod

@@ -1,43 +1,24 @@
 module git.grassecon.net/urdt/ussd
 
-go 1.23.0
-
-toolchain go1.23.2
+go 1.22.6
 
 require (
-	git.defalsify.org/vise.git v0.2.1-0.20241017112704-307fa6fcdc6b
+	git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f
 	github.com/alecthomas/assert/v2 v2.2.2
-	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
 	github.com/peteole/testdata-loader v0.3.0
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
 )
 
-require github.com/grassrootseconomics/ussd-data-service v0.0.0-20241003123429-4904b4438a3a // indirect
-
-require (
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgx/v5 v5.7.1 // indirect
-	github.com/jackc/puddle/v2 v2.2.2 // indirect
-	github.com/joho/godotenv v1.5.1
-	github.com/kr/text v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
-)
-
 require (
 	github.com/alecthomas/participle/v2 v2.0.0 // indirect
 	github.com/alecthomas/repr v0.2.0 // indirect
 	github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
-	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.9.0
 	github.com/x448/float16 v0.8.4 // indirect

go.sum

@@ -1,5 +1,5 @@
-git.defalsify.org/vise.git v0.2.1-0.20241017112704-307fa6fcdc6b h1:dxBplsIlzJHV+5EH+gzB+w08Blt7IJbb2jeRe1OEjLU=
-git.defalsify.org/vise.git v0.2.1-0.20241017112704-307fa6fcdc6b/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f h1:CuJvG3NyMoRtHUim4aZdrfjjJBg2AId7z0yp7Q97bRM=
+git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
 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=
@@ -8,67 +8,29 @@ github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk
 github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
 github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
-github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
-github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQxMP/6OST1BByrNDj+rqXDmU=
-github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo=
-github.com/grassrootseconomics/ussd-data-service v0.0.0-20241003123429-4904b4438a3a h1:q/YH7nE2j8epNmFnTu0tU1vwtCxtQ6nH+d7hRVV5krU=
-github.com/grassrootseconomics/ussd-data-service v0.0.0-20241003123429-4904b4438a3a/go.mod h1:hdKaKwqiW6/kphK4j/BhmuRlZDLo1+DYo3gYw5O0siw=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
-github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
-github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
-github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk=
-github.com/pashagolub/pgxmock/v4 v4.3.0 h1:DqT7fk0OCK6H0GvqtcMsLpv8cIwWqdxWgfZNLeHCb/s=
-github.com/pashagolub/pgxmock/v4 v4.3.0/go.mod h1:9VoVHXwS3XR/yPtKGzwQvwZX1kzGB9sM8SviDcHDa3A=
 github.com/peteole/testdata-loader v0.3.0 h1:8jckE9KcyNHgyv/VPoaljvKZE0Rqr8+dPVYH6rfNr9I=
 github.com/peteole/testdata-loader v0.3.0/go.mod h1:Mt0ZbRtb56u8SLJpNP+BnQbENljMorYBpqlvt3cS83U=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2XjI7Zan2InxSUQWrU=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

initializers/load.go

@@ -1,34 +0,0 @@
-package initializers
-
-import (
-	"log"
-	"os"
-	"strconv"
-
-	"github.com/joho/godotenv"
-)
-
-func LoadEnvVariables() {
-	err := godotenv.Load()
-	if err != nil {
-		log.Fatal("Error loading .env file")
-	}
-}
-
-// Helper to get environment variables with a default fallback
-func GetEnv(key, defaultVal string) string {
-  if value, exists := os.LookupEnv(key); exists {
-   	return value
-	}
-  return defaultVal
-}
-
-// Helper to safely convert environment variables to uint
-func GetEnvUint(key string, defaultVal uint) uint {
-	if value, exists := os.LookupEnv(key); exists {
-		if parsed, err := strconv.Atoi(value); err == nil && parsed >= 0 {
-			return uint(parsed)
-		}
-	}
-	return defaultVal
-}

internal/handlers/base.go

@@ -46,7 +46,7 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	var err error
 	var ok bool
 	
-	logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs)
+	logg.InfoCtxf(rqs.Ctx, "new request",  rqs)
 
 	rqs.Storage, err = f.provider.Get(rqs.Config.SessionId)
 	if err != nil {
@@ -71,7 +71,19 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	}
 	rqs.Engine = en
 
-	r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input)
+	r, err = rqs.Engine.Init(rqs.Ctx)
+	if err != nil {
+		perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
+		rqs.Storage = nil
+		if perr != nil {
+			logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
+		}
+		return rqs, err
+	}
+
+	if r && len(rqs.Input) > 0 {
+		r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input)
+	}
 	if err != nil {
 		perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
 		rqs.Storage = nil
@@ -87,7 +99,7 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 
 func(f *BaseSessionHandler) Output(rqs RequestSession) (RequestSession,  error) {
 	var err error
-	_, err = rqs.Engine.Flush(rqs.Ctx, rqs.Writer)
+	_, err = rqs.Engine.WriteResult(rqs.Ctx, rqs.Writer)
 	return rqs, err
 }
 

internal/handlers/handlerservice.go

@@ -1,110 +0,0 @@
-package handlers
-
-import (
-	"git.defalsify.org/vise.git/asm"
-	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
-)
-
-type HandlerService interface {
-	GetHandler() (*ussd.Handlers, 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
-	DbRs          *resource.DbResource
-	Pe            *persist.Persister
-	UserdataStore *db.Db
-	Cfg           engine.Config
-	Rs            resource.Resource
-}
-
-func NewLocalHandlerService(fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
-	parser, err := getParser(fp, debug)
-	if err != nil {
-		return nil, err
-	}
-	return &LocalHandlerService{
-		Parser: parser,
-		DbRs:   dbResource,
-		Cfg:    cfg,
-		Rs:     rs,
-	}, nil
-}
-
-func (ls *LocalHandlerService) SetPersister(Pe *persist.Persister) {
-	ls.Pe = Pe
-}
-
-func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
-	ls.UserdataStore = db
-}
-
-func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceInterface) (*ussd.Handlers, error) {
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore,accountService)
-	if err != nil {
-		return nil, err
-	}
-	ussdHandlers = ussdHandlers.WithPersister(ls.Pe)
-	ls.DbRs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
-	ls.DbRs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
-	ls.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
-	ls.DbRs.AddLocalFunc("verify_create_pin", ussdHandlers.VerifyCreatePin)
-	ls.DbRs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
-	ls.DbRs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
-	ls.DbRs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
-	ls.DbRs.AddLocalFunc("quit", ussdHandlers.Quit)
-	ls.DbRs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
-	ls.DbRs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
-	ls.DbRs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
-	ls.DbRs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
-	ls.DbRs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
-	ls.DbRs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
-	ls.DbRs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
-	ls.DbRs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
-	ls.DbRs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
-	ls.DbRs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
-	ls.DbRs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
-	ls.DbRs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
-	ls.DbRs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
-	ls.DbRs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
-	ls.DbRs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
-	ls.DbRs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
-	ls.DbRs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
-	ls.DbRs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
-	ls.DbRs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
-	ls.DbRs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
-	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
-	ls.DbRs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
-	ls.DbRs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
-	ls.DbRs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
-	ls.DbRs.AddLocalFunc("quit_with_help", ussdHandlers.QuitWithHelp)
-	ls.DbRs.AddLocalFunc("fetch_custodial_balances", ussdHandlers.FetchCustodialBalances)
-	ls.DbRs.AddLocalFunc("set_default_voucher", ussdHandlers.SetDefaultVoucher)
-	ls.DbRs.AddLocalFunc("check_vouchers", ussdHandlers.CheckVouchers)
-	ls.DbRs.AddLocalFunc("get_vouchers", ussdHandlers.GetVoucherList)
-	ls.DbRs.AddLocalFunc("view_voucher", ussdHandlers.ViewVoucher)
-	ls.DbRs.AddLocalFunc("set_voucher", ussdHandlers.SetVoucher)
-
-	return ussdHandlers, nil
-}
-
-// TODO: enable setting of sessionId on engine init time
-func (ls *LocalHandlerService) GetEngine() *engine.DefaultEngine {
-	en := engine.NewEngine(ls.Cfg, ls.Rs)
-	en = en.WithPersister(ls.Pe)
-	return en
-}

internal/handlers/server/accountservice.go

@@ -1,185 +1,112 @@
 package server
 
 import (
-	"context"
 	"encoding/json"
-	"errors"
-	"fmt"
 	"io"
 	"net/http"
-	"os"
 
 	"git.grassecon.net/urdt/ussd/config"
 	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
-)
-
-var (
-	okResponse  api.OKResponse
-	errResponse api.ErrResponse
 )
 
 type AccountServiceInterface interface {
-	CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error)
-	CreateAccount(ctx context.Context) (*api.OKResponse, error)
-	CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error)
-	TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error)
-	FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error)
+	CheckBalance(publicKey string) (string, error)
+	CreateAccount() (*models.AccountResponse, error)
+	CheckAccountStatus(trackingId string) (string, error)
 }
 
 type AccountService struct {
 }
 
+
+
+// CheckAccountStatus retrieves the status of an account transaction based on the provided tracking ID.
+//
 // Parameters:
 //   - trackingId: A unique identifier for the account.This should be obtained from a previous call to
 //     CreateAccount or a similar function that returns an AccountResponse. The `trackingId` field in the
 //     AccountResponse struct can be used here to check the account status during a transaction.
 //
+//
 // Returns:
 //   - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
-//     If no error occurs, this will be nil
-func (as *AccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
-	resp, err := http.Get(config.BalanceURL + trackingId)
+//     If no error occurs, this will be nil.
+//
+func (as *AccountService) CheckAccountStatus(trackingId string) (string, error) {
+	resp, err := http.Get(config.TrackStatusURL + trackingId)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
 	var trackResp models.TrackStatusResponse
 	err = json.Unmarshal(body, &trackResp)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return &trackResp, nil
 
+	status := trackResp.Result.Transaction.Status
+
+	return status, nil
 }
 
-func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
-	var err error
-	// Construct the URL with the path parameter
-	url := fmt.Sprintf("%s/%s", config.TrackURL, publicKey)
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-GE-KEY", "xd")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		errResponse.Description = err.Error()
-		return nil, err
-	}
-	if resp.StatusCode >= http.StatusBadRequest {
-		err := json.Unmarshal([]byte(body), &errResponse)
-		if err != nil {
-			return nil, err
-		}
-		return nil, errors.New(errResponse.Description)
-	}
-	err = json.Unmarshal([]byte(body), &okResponse)
-	if err != nil {
-		return nil, err
-	}
-	if len(okResponse.Result) == 0 {
-		return nil, errors.New("Empty api result")
-	}
-	return &okResponse, nil
-
-}
 
 // CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
 // Parameters:
 //   - publicKey: The public key associated with the account whose balance needs to be checked.
-func (as *AccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
+func (as *AccountService) CheckBalance(publicKey string) (string, error) {
+
 	resp, err := http.Get(config.BalanceURL + publicKey)
 	if err != nil {
-		return nil, err
+		return "0.0", err
 	}
 	defer resp.Body.Close()
+
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, err
+		return "0.0", err
 	}
+
 	var balanceResp models.BalanceResponse
 	err = json.Unmarshal(body, &balanceResp)
 	if err != nil {
-		return nil, err
+		return "0.0", err
 	}
-	return &balanceResp, nil
+
+	balance := balanceResp.Result.Balance
+	return balance, nil
 }
 
-// CreateAccount creates a new account in the custodial system.
+
+//CreateAccount creates a new account in the custodial system.
 // Returns:
 //   - *models.AccountResponse: A pointer to an AccountResponse struct containing the details of the created account.
 //     If there is an error during the request or processing, this will be nil.
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
 //     If no error occurs, this will be nil.
-func (as *AccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
-	var err error
-
-	// Create a new request
-	req, err := http.NewRequest("POST", config.CreateAccountURL, nil)
+func (as *AccountService) CreateAccount() (*models.AccountResponse, error) {
+	resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
 	if err != nil {
 		return nil, err
 	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-GE-KEY", "xd")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		errResponse.Description = err.Error()
-		return nil, err
-	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
-	if resp.StatusCode >= http.StatusBadRequest {
-		err := json.Unmarshal([]byte(body), &errResponse)
-		if err != nil {
-			return nil, err
-		}
-		return nil, errors.New(errResponse.Description)
-	}
-	err = json.Unmarshal([]byte(body), &okResponse)
+
+	var accountResp models.AccountResponse
+	err = json.Unmarshal(body, &accountResp)
 	if err != nil {
 		return nil, err
 	}
-	if len(okResponse.Result) == 0 {
-		return nil, errors.New("Empty api result")
-	}
-	return &okResponse, nil
-}
 
-// FetchVouchers retrieves the token holdings for a given public key from the custodial holdings API endpoint
-// Parameters:
-//   - publicKey: The public key associated with the account.
-func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
-	file, err := os.Open("sample_tokens.json")
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	var holdings models.VoucherHoldingResponse
-
-	if err := json.NewDecoder(file).Decode(&holdings); err != nil {
-		return nil, err
-	}
-	return &holdings, nil
+	return &accountResp, nil
 }

internal/handlers/single.go

@@ -37,6 +37,8 @@ type RequestSession struct {
 	Continue bool
 }
 
+type engineMaker func(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine
+
 // TODO: seems like can remove this.
 type RequestParser interface {
 	GetSessionId(rq any) (string, error)

internal/handlers/ussd/mocks/servicemock.go

@@ -0,0 +1,26 @@
+package mocks
+
+import (
+	"git.grassecon.net/urdt/ussd/internal/models"
+	"github.com/stretchr/testify/mock"
+)
+
+// MockAccountService implements AccountServiceInterface for testing
+type MockAccountService struct {
+	mock.Mock
+}
+
+func (m *MockAccountService) CreateAccount() (*models.AccountResponse, error) {
+	args := m.Called()
+	return args.Get(0).(*models.AccountResponse), args.Error(1)
+}
+
+func (m *MockAccountService) CheckBalance(publicKey string) (string, error) {
+	args := m.Called(publicKey)
+	return args.String(0), args.Error(1)
+}
+
+func (m *MockAccountService) CheckAccountStatus(trackingId string) (string, error) {
+	args := m.Called(trackingId)
+	return args.String(0), args.Error(1)
+}

internal/http/at_session_handler.go

@@ -32,7 +32,6 @@ func (ash *ATSessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request)
 	if err != nil {
 		logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
 		ash.writeError(w, 400, err)
-		return
 	}
 	rqs.Config = cfg
 	rqs.Input, err = rp.GetInput(req)
@@ -42,14 +41,16 @@ func (ash *ATSessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request)
 		return
 	}
 
-	rqs, err = ash.Process(rqs) 
+	rqs, err = ash.Process(rqs)
 	switch err {
-	case nil: // set code to 200 if no err
-		code = 200
-	case handlers.ErrStorage, handlers.ErrEngineInit, handlers.ErrEngineExec, handlers.ErrEngineType:
+	case handlers.ErrStorage:
+		code = 500
+	case handlers.ErrEngineInit:
+		code = 500
+	case handlers.ErrEngineExec:
 		code = 500
 	default:
-		code = 500
+		code = 200
 	}
 
 	if code != 200 {
@@ -87,6 +88,6 @@ func (ash *ATSessionHandler) Output(rqs handlers.RequestSession) (handlers.Reque
 		return rqs, err
 	}
 
-	_, err = rqs.Engine.Flush(rqs.Ctx, rqs.Writer)
+	_, err = rqs.Engine.WriteResult(rqs.Ctx, rqs.Writer)
 	return rqs, err
 }

internal/http/http_test.go

@@ -1,449 +0,0 @@
-package http
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-	"testing"
-
-	"git.defalsify.org/vise.git/engine"
-	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/testutil/mocks/httpmocks"
-)
-
-// invalidRequestType is a custom type to test invalid request scenarios
-type invalidRequestType struct{}
-
-// errorReader is a helper type that always returns an error when Read is called
-type errorReader struct{}
-
-func (e *errorReader) Read(p []byte) (n int, err error) {
-	return 0, errors.New("read error")
-}
-
-func TestNewATSessionHandler(t *testing.T) {
-	mockHandler := &httpmocks.MockRequestHandler{}
-	ash := NewATSessionHandler(mockHandler)
-
-	if ash == nil {
-		t.Fatal("NewATSessionHandler returned nil")
-	}
-
-	if ash.SessionHandler == nil {
-		t.Fatal("SessionHandler is nil")
-	}
-}
-
-func TestATSessionHandler_ServeHTTP(t *testing.T) {
-	tests := []struct {
-		name           string
-		setupMocks     func(*httpmocks.MockRequestHandler, *httpmocks.MockRequestParser, *httpmocks.MockEngine)
-		formData       url.Values
-		expectedStatus int
-		expectedBody   string
-	}{
-		{
-			name: "Successful request",
-			setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
-				mrp.GetSessionIdFunc = func(rq any) (string, error) {
-					req := rq.(*http.Request)
-					return req.FormValue("phoneNumber"), nil
-				}
-				mrp.GetInputFunc = func(rq any) ([]byte, error) {
-					req := rq.(*http.Request)
-					text := req.FormValue("text")
-					parts := strings.Split(text, "*")
-					return []byte(parts[len(parts)-1]), nil
-				}
-				mh.ProcessFunc = func(rqs handlers.RequestSession) (handlers.RequestSession, error) {
-					rqs.Continue = true
-					rqs.Engine = me
-					return rqs, nil
-				}
-				mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
-				mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
-				mh.OutputFunc = func(rs handlers.RequestSession) (handlers.RequestSession, error) { return rs, nil }
-				mh.ResetFunc = func(rs handlers.RequestSession) (handlers.RequestSession, error) { return rs, nil }
-				me.FlushFunc = func(context.Context, io.Writer) (int, error) { return 0, nil }
-			},
-			formData: url.Values{
-				"phoneNumber": []string{"+1234567890"},
-				"text":        []string{"1*2*3"},
-			},
-			expectedStatus: http.StatusOK,
-			expectedBody:   "CON ",
-		},
-		{
-			name: "GetSessionId error",
-			setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
-				mrp.GetSessionIdFunc = func(rq any) (string, error) {
-					return "", errors.New("no phone number found")
-				}
-				mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
-				mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
-			},
-			formData: url.Values{
-				"text": []string{"1*2*3"},
-			},
-			expectedStatus: http.StatusBadRequest,
-			expectedBody:   "",
-		},
-		{
-			name: "GetInput error",
-			setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
-				mrp.GetSessionIdFunc = func(rq any) (string, error) {
-					req := rq.(*http.Request)
-					return req.FormValue("phoneNumber"), nil
-				}
-				mrp.GetInputFunc = func(rq any) ([]byte, error) {
-					return nil, errors.New("no input found")
-				}
-				mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
-				mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
-			},
-			formData: url.Values{
-				"phoneNumber": []string{"+1234567890"},
-			},
-			expectedStatus: http.StatusBadRequest,
-			expectedBody:   "",
-		},
-		{
-			name: "Process error",
-			setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
-				mrp.GetSessionIdFunc = func(rq any) (string, error) {
-					req := rq.(*http.Request)
-					return req.FormValue("phoneNumber"), nil
-				}
-				mrp.GetInputFunc = func(rq any) ([]byte, error) {
-					req := rq.(*http.Request)
-					text := req.FormValue("text")
-					parts := strings.Split(text, "*")
-					return []byte(parts[len(parts)-1]), nil
-				}
-				mh.ProcessFunc = func(rqs handlers.RequestSession) (handlers.RequestSession, error) {
-					return rqs, handlers.ErrStorage
-				}
-				mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
-				mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
-			},
-			formData: url.Values{
-				"phoneNumber": []string{"+1234567890"},
-				"text":        []string{"1*2*3"},
-			},
-			expectedStatus: http.StatusInternalServerError,
-			expectedBody:   "",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			mockHandler := &httpmocks.MockRequestHandler{}
-			mockRequestParser := &httpmocks.MockRequestParser{}
-			mockEngine := &httpmocks.MockEngine{}
-			tt.setupMocks(mockHandler, mockRequestParser, mockEngine)
-
-			ash := NewATSessionHandler(mockHandler)
-
-			req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(tt.formData.Encode()))
-			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-			w := httptest.NewRecorder()
-
-			ash.ServeHTTP(w, req)
-
-			if w.Code != tt.expectedStatus {
-				t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
-			}
-
-			if tt.expectedBody != "" && w.Body.String() != tt.expectedBody {
-				t.Errorf("Expected body %q, got %q", tt.expectedBody, w.Body.String())
-			}
-		})
-	}
-}
-
-func TestATSessionHandler_Output(t *testing.T) {
-	tests := []struct {
-		name           string
-		input          handlers.RequestSession
-		expectedPrefix string
-		expectedError  bool
-	}{
-		{
-			name: "Continue true",
-			input: handlers.RequestSession{
-				Continue: true,
-				Engine: &httpmocks.MockEngine{
-					FlushFunc: func(context.Context, io.Writer) (int, error) {
-						return 0, nil
-					},
-				},
-				Writer: &httpmocks.MockWriter{},
-			},
-			expectedPrefix: "CON ",
-			expectedError:  false,
-		},
-		{
-			name: "Continue false",
-			input: handlers.RequestSession{
-				Continue: false,
-				Engine: &httpmocks.MockEngine{
-					FlushFunc: func(context.Context, io.Writer) (int, error) {
-						return 0, nil
-					},
-				},
-				Writer: &httpmocks.MockWriter{},
-			},
-			expectedPrefix: "END ",
-			expectedError:  false,
-		},
-		{
-			name: "Flush error",
-			input: handlers.RequestSession{
-				Continue: true,
-				Engine: &httpmocks.MockEngine{
-					FlushFunc: func(context.Context, io.Writer) (int, error) {
-						return 0, errors.New("write error")
-					},
-				},
-				Writer: &httpmocks.MockWriter{},
-			},
-			expectedPrefix: "CON ",
-			expectedError:  true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ash := &ATSessionHandler{}
-			_, err := ash.Output(tt.input)
-
-			if tt.expectedError && err == nil {
-				t.Error("Expected an error, but got nil")
-			}
-
-			if !tt.expectedError && err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-
-			mw := tt.input.Writer.(*httpmocks.MockWriter)
-			if !mw.WriteStringCalled {
-				t.Error("WriteString was not called")
-			}
-
-			if mw.WrittenString != tt.expectedPrefix {
-				t.Errorf("Expected prefix %q, got %q", tt.expectedPrefix, mw.WrittenString)
-			}
-		})
-	}
-}
-
-func TestSessionHandler_ServeHTTP(t *testing.T) {
-	tests := []struct {
-		name           string
-		sessionID      string
-		input          []byte
-		parserErr      error
-		processErr     error
-		outputErr      error
-		resetErr       error
-		expectedStatus int
-	}{
-		{
-			name:           "Success",
-			sessionID:      "123",
-			input:          []byte("test input"),
-			expectedStatus: http.StatusOK,
-		},
-		{
-			name:           "Missing Session ID",
-			sessionID:      "",
-			parserErr:      handlers.ErrSessionMissing,
-			expectedStatus: http.StatusBadRequest,
-		},
-		{
-			name:           "Process Error",
-			sessionID:      "123",
-			input:          []byte("test input"),
-			processErr:     handlers.ErrStorage,
-			expectedStatus: http.StatusInternalServerError,
-		},
-		{
-			name:           "Output Error",
-			sessionID:      "123",
-			input:          []byte("test input"),
-			outputErr:      errors.New("output error"),
-			expectedStatus: http.StatusOK,
-		},
-		{
-			name:           "Reset Error",
-			sessionID:      "123",
-			input:          []byte("test input"),
-			resetErr:       errors.New("reset error"),
-			expectedStatus: http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			mockRequestParser := &httpmocks.MockRequestParser{
-				GetSessionIdFunc: func(any) (string, error) {
-					return tt.sessionID, tt.parserErr
-				},
-				GetInputFunc: func(any) ([]byte, error) {
-					return tt.input, nil
-				},
-			}
-
-			mockRequestHandler := &httpmocks.MockRequestHandler{
-				ProcessFunc: func(rs handlers.RequestSession) (handlers.RequestSession, error) {
-					return rs, tt.processErr
-				},
-				OutputFunc: func(rs handlers.RequestSession) (handlers.RequestSession, error) {
-					return rs, tt.outputErr
-				},
-				ResetFunc: func(rs handlers.RequestSession) (handlers.RequestSession, error) {
-					return rs, tt.resetErr
-				},
-				GetRequestParserFunc: func() handlers.RequestParser {
-					return mockRequestParser
-				},
-				GetConfigFunc: func() engine.Config {
-					return engine.Config{}
-				},
-			}
-
-			sessionHandler := ToSessionHandler(mockRequestHandler)
-
-			req := httptest.NewRequest(http.MethodPost, "/", bytes.NewBuffer(tt.input))
-			req.Header.Set("X-Vise-Session", tt.sessionID)
-
-			rr := httptest.NewRecorder()
-
-			sessionHandler.ServeHTTP(rr, req)
-
-			if status := rr.Code; status != tt.expectedStatus {
-				t.Errorf("handler returned wrong status code: got %v want %v",
-					status, tt.expectedStatus)
-			}
-		})
-	}
-}
-
-func TestSessionHandler_writeError(t *testing.T) {
-	handler := &SessionHandler{}
-	mockWriter := &httpmocks.MockWriter{}
-	err := errors.New("test error")
-
-	handler.writeError(mockWriter, http.StatusBadRequest, err)
-
-	if mockWriter.WrittenString != "" {
-		t.Errorf("Expected empty body, got %s", mockWriter.WrittenString)
-	}
-}
-
-func TestDefaultRequestParser_GetSessionId(t *testing.T) {
-	tests := []struct {
-		name          string
-		request       any
-		expectedID    string
-		expectedError error
-	}{
-		{
-			name: "Valid Session ID",
-			request: func() *http.Request {
-				req := httptest.NewRequest(http.MethodPost, "/", nil)
-				req.Header.Set("X-Vise-Session", "123456")
-				return req
-			}(),
-			expectedID:    "123456",
-			expectedError: nil,
-		},
-		{
-			name:          "Missing Session ID",
-			request:       httptest.NewRequest(http.MethodPost, "/", nil),
-			expectedID:    "",
-			expectedError: handlers.ErrSessionMissing,
-		},
-		{
-			name:          "Invalid Request Type",
-			request:       invalidRequestType{},
-			expectedID:    "",
-			expectedError: handlers.ErrInvalidRequest,
-		},
-	}
-
-	parser := &DefaultRequestParser{}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			id, err := parser.GetSessionId(tt.request)
-
-			if id != tt.expectedID {
-				t.Errorf("Expected session ID %s, got %s", tt.expectedID, id)
-			}
-
-			if err != tt.expectedError {
-				t.Errorf("Expected error %v, got %v", tt.expectedError, err)
-			}
-		})
-	}
-}
-
-func TestDefaultRequestParser_GetInput(t *testing.T) {
-	tests := []struct {
-		name          string
-		request       any
-		expectedInput []byte
-		expectedError error
-	}{
-		{
-			name: "Valid Input",
-			request: func() *http.Request {
-				return httptest.NewRequest(http.MethodPost, "/", bytes.NewBufferString("test input"))
-			}(),
-			expectedInput: []byte("test input"),
-			expectedError: nil,
-		},
-		{
-			name:          "Empty Input",
-			request:       httptest.NewRequest(http.MethodPost, "/", nil),
-			expectedInput: []byte{},
-			expectedError: nil,
-		},
-		{
-			name:          "Invalid Request Type",
-			request:       invalidRequestType{},
-			expectedInput: nil,
-			expectedError: handlers.ErrInvalidRequest,
-		},
-		{
-			name: "Read Error",
-			request: func() *http.Request {
-				return httptest.NewRequest(http.MethodPost, "/", &errorReader{})
-			}(),
-			expectedInput: nil,
-			expectedError: errors.New("read error"),
-		},
-	}
-
-	parser := &DefaultRequestParser{}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			input, err := parser.GetInput(tt.request)
-
-			if !bytes.Equal(input, tt.expectedInput) {
-				t.Errorf("Expected input %s, got %s", tt.expectedInput, input)
-			}
-
-			if err != tt.expectedError && (err == nil || err.Error() != tt.expectedError.Error()) {
-				t.Errorf("Expected error %v, got %v", tt.expectedError, err)
-			}
-		})
-	}
-}

internal/models/accountresponse.go

@@ -1,10 +1,15 @@
 package models
 
+import (
+	"encoding/json"
+
+)
+
 type AccountResponse struct {
-	Ok          bool   `json:"ok"`
-	Description string `json:"description"` // Include the description field
-	Result      struct {
-		PublicKey  string `json:"publicKey"`
-		TrackingId string `json:"trackingId"`
+	Ok     bool `json:"ok"`
+	Result struct {
+		CustodialId json.Number `json:"custodialId"`
+		PublicKey   string      `json:"publicKey"`
+		TrackingId  string      `json:"trackingId"`
 	} `json:"result"`
-}
+}

internal/models/tokenresponse.go

@@ -1,18 +0,0 @@
-package models
-
-type ApiResponse struct {
-	OK          bool   `json:"ok"`
-	Description string `json:"description"`
-	Result      Result `json:"result"`
-}
-
-type Result struct {
-	Holdings []Holding `json:"holdings"`
-}
-
-type Holding struct {
-	ContractAddress string `json:"contractAddress"`
-	TokenSymbol     string `json:"tokenSymbol"`
-	TokenDecimals   string `json:"tokenDecimals"`
-	Balance         string `json:"balance"`
-}

internal/models/trackstatusresponse.go

@@ -4,13 +4,7 @@ import (
 	"encoding/json"
 	"time"
 )
-type Transaction struct {
-	CreatedAt     time.Time   `json:"createdAt"`
-	Status        string      `json:"status"`
-	TransferValue json.Number `json:"transferValue"`
-	TxHash        string      `json:"txHash"`
-	TxType        string      `json:"txType"`
-}
+
 
 type TrackStatusResponse struct {
 	Ok     bool `json:"ok"`
@@ -23,4 +17,4 @@ type TrackStatusResponse struct {
 			TxType        string      `json:"txType"`
 		}
 	} `json:"result"`
-}
+}

internal/models/vouchersresponse.go

@@ -1,14 +0,0 @@
-package models
-
-import dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
-
-type VoucherHoldingResponse struct {
-	Ok          bool          `json:"ok"`
-	Description string        `json:"description"`
-	Result      VoucherResult `json:"result"`
-}
-
-// VoucherResult holds the list of token holdings
-type VoucherResult struct {
-	Holdings []dataserviceapi.TokenHoldings `json:"holdings"`
-}

internal/storage/db.go

@@ -1,47 +0,0 @@
-package storage
-
-import (
-	"context"
-
-	"git.defalsify.org/vise.git/db"
-)
-
-const (
-	DATATYPE_USERSUB = 64
-)
-
-// PrefixDb interface abstracts the database operations.
-type PrefixDb interface {
-	Get(ctx context.Context, key []byte) ([]byte, error)
-	Put(ctx context.Context, key []byte, val []byte) error
-}
-
-var _ PrefixDb = (*SubPrefixDb)(nil)
-
-type SubPrefixDb struct {
-	store db.Db
-	pfx   []byte
-}
-
-func NewSubPrefixDb(store db.Db, pfx []byte) *SubPrefixDb {
-	return &SubPrefixDb{
-		store: store,
-		pfx:   pfx,
-	}
-}
-
-func (s *SubPrefixDb) toKey(k []byte) []byte {
-	return append(s.pfx, k...)
-}
-
-func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-	s.store.SetPrefix(DATATYPE_USERSUB)
-	key = s.toKey(key)
-	return s.store.Get(ctx, key)
-}
-
-func (s *SubPrefixDb) Put(ctx context.Context, key []byte, val []byte) error {
-	s.store.SetPrefix(DATATYPE_USERSUB)
-	key = s.toKey(key)
-	return s.store.Put(ctx, key, val)
-}

internal/storage/db_test.go

@@ -1,54 +0,0 @@
-package storage
-
-import (
-	"bytes"
-	"context"
-	"testing"
-
-	memdb "git.defalsify.org/vise.git/db/mem"
-)
-
-func TestSubPrefix(t *testing.T) {
-	ctx := context.Background()
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	sdba := NewSubPrefixDb(db, []byte("tinkywinky"))
-	err = sdba.Put(ctx, []byte("foo"), []byte("dipsy"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	r, err := sdba.Get(ctx, []byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(r, []byte("dipsy")) {
-		t.Fatalf("expected 'dipsy', got %s", r)
-	}
-
-	sdbb := NewSubPrefixDb(db, []byte("lala"))
-	r, err = sdbb.Get(ctx, []byte("foo"))
-	if err == nil {
-		t.Fatal("expected not found")
-	}
-
-	err = sdbb.Put(ctx, []byte("foo"), []byte("pu"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	r, err = sdbb.Get(ctx, []byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(r, []byte("pu")) {
-		t.Fatalf("expected 'pu', got %s", r)
-	}
-
-	r, err = sdba.Get(ctx, []byte("foo"))
-	if !bytes.Equal(r, []byte("dipsy")) {
-		t.Fatalf("expected 'dipsy', got %s", r)
-	}
-}

internal/storage/gdbm.go

@@ -1,116 +0,0 @@
-package storage
-
-import (
-	"context"
-
-	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/lang"
-	gdbmdb "git.defalsify.org/vise.git/db/gdbm"
-)
-
-var (
-	dbC map[string]chan db.Db
-)
-
-type ThreadGdbmDb struct {
-	db db.Db
-	connStr string
-}
-
-func NewThreadGdbmDb() *ThreadGdbmDb {
-	if dbC == nil {
-		dbC = make(map[string]chan db.Db)
-	}
-	return &ThreadGdbmDb{}
-}
-
-func(tdb *ThreadGdbmDb) Connect(ctx context.Context, connStr string) error {
-	var ok bool
-	_, ok = dbC[connStr]
-	if ok {
-		logg.WarnCtxf(ctx, "already registered thread gdbm, skipping", "connStr", connStr)
-		return nil
-	}
-	gdb := gdbmdb.NewGdbmDb()
-	err := gdb.Connect(ctx, connStr)
-	if err != nil {
-		return err
-	}
-	dbC[connStr] = make(chan db.Db, 1)
-	dbC[connStr]<- gdb
-	tdb.connStr = connStr
-	return nil
-}
-
-func(tdb *ThreadGdbmDb) reserve() {
-	if tdb.db == nil {
-		tdb.db = <-dbC[tdb.connStr]
-	}
-}
-
-func(tdb *ThreadGdbmDb) release() {
-	if tdb.db == nil {
-		return
-	}
-	dbC[tdb.connStr] <- tdb.db
-	tdb.db = nil
-}
-
-func(tdb *ThreadGdbmDb) SetPrefix(pfx uint8) {
-	tdb.reserve()
-	tdb.db.SetPrefix(pfx)
-}
-
-func(tdb *ThreadGdbmDb) SetSession(sessionId string) {
-	tdb.reserve()
-	tdb.db.SetSession(sessionId)
-}
-
-func(tdb *ThreadGdbmDb) SetLanguage(lng *lang.Language) {
-	tdb.reserve()
-	tdb.db.SetLanguage(lng)
-}
-
-func(tdb *ThreadGdbmDb) Safe() bool {
-	tdb.reserve()
-	v := tdb.db.Safe()
-	tdb.release()
-	return v
-}
-
-func(tdb *ThreadGdbmDb) Prefix() uint8 {
-	tdb.reserve()
-	v := tdb.db.Prefix()
-	tdb.release()
-	return v
-}
-
-func(tdb *ThreadGdbmDb) SetLock(typ uint8, locked bool) error {
-	tdb.reserve()
-	err := tdb.db.SetLock(typ, locked)
-	tdb.release()
-	return err
-}
-
-func(tdb *ThreadGdbmDb) Put(ctx context.Context, key []byte, val []byte) error {
-	tdb.reserve()
-	err := tdb.db.Put(ctx, key, val)
-	tdb.release()
-	return err
-}
-
-func(tdb *ThreadGdbmDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-	tdb.reserve()
-	v, err := tdb.db.Get(ctx, key)
-	tdb.release()
-	return v, err
-}
-
-func(tdb *ThreadGdbmDb) Close() error {
-	tdb.reserve()
-	close(dbC[tdb.connStr])
-	delete(dbC, tdb.connStr)
-	err := tdb.db.Close()
-	tdb.db = nil
-	return err
-}

internal/storage/storageservice.go

@@ -1,152 +0,0 @@
-package storage
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path"
-
-	"git.defalsify.org/vise.git/db"
-	fsdb "git.defalsify.org/vise.git/db/fs"
-	"git.defalsify.org/vise.git/db/postgres"
-	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/initializers"
-)
-
-var (
-	logg = logging.NewVanilla().WithDomain("storage")
-)
-
-type StorageService interface {
-	GetPersister(ctx context.Context) (*persist.Persister, error)
-	GetUserdataDb(ctx context.Context) db.Db
-	GetResource(ctx context.Context) (resource.Resource, error)
-	EnsureDbDir() error
-}
-
-type MenuStorageService struct {
-	dbDir         string
-	resourceDir   string
-	resourceStore db.Db
-	stateStore    db.Db
-	userDataStore db.Db
-}
-
-func buildConnStr() string {
-	host := initializers.GetEnv("DB_HOST", "localhost")
-	user := initializers.GetEnv("DB_USER", "postgres")
-	password := initializers.GetEnv("DB_PASSWORD", "")
-	dbName := initializers.GetEnv("DB_NAME", "")
-	port := initializers.GetEnv("DB_PORT", "5432")
-
-	return fmt.Sprintf(
-		"postgres://%s:%s@%s:%s/%s",
-		user, password, host, port, dbName,
-	)
-}
-
-func NewMenuStorageService(dbDir string, resourceDir string) *MenuStorageService {
-	return &MenuStorageService{
-		dbDir:       dbDir,
-		resourceDir: resourceDir,
-	}
-}
-
-func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.Db, fileName string) (db.Db, error) {
-	database, ok := ctx.Value("Database").(string)
-	if !ok {
-		return nil, fmt.Errorf("failed to select the database")
-	}
-
-	if existingDb != nil {
-		return existingDb, nil
-	}
-
-	var newDb db.Db
-	var err error
-
-	if database == "postgres" {
-		newDb = postgres.NewPgDb()
-		connStr := buildConnStr()
-		err = newDb.Connect(ctx, connStr)
-	} else {
-		newDb = NewThreadGdbmDb()
-		storeFile := path.Join(ms.dbDir, fileName)
-		err = newDb.Connect(ctx, storeFile)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return newDb, nil
-}
-
-func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persister, error) {
-	stateStore, err := ms.GetStateStore(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	pr := persist.NewPersister(stateStore)
-	logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", stateStore)
-	return pr, nil
-}
-
-func (ms *MenuStorageService) GetUserdataDb(ctx context.Context) (db.Db, error) {
-	if ms.userDataStore != nil {
-		return ms.userDataStore, nil
-	}
-
-	userDataStore, err := ms.getOrCreateDb(ctx, ms.userDataStore, "userdata.gdbm")
-	if err != nil {
-		return nil, err
-	}
-
-	ms.userDataStore = userDataStore
-	return ms.userDataStore, nil
-}
-
-func (ms *MenuStorageService) GetResource(ctx context.Context) (resource.Resource, error) {
-	ms.resourceStore = fsdb.NewFsDb()
-	err := ms.resourceStore.Connect(ctx, ms.resourceDir)
-	if err != nil {
-		return nil, err
-	}
-	rfs := resource.NewDbResource(ms.resourceStore)
-	return rfs, nil
-}
-
-func (ms *MenuStorageService) GetStateStore(ctx context.Context) (db.Db, error) {
-	if ms.stateStore != nil {
-		return ms.stateStore, nil
-	}
-
-	stateStore, err := ms.getOrCreateDb(ctx, ms.stateStore, "state.gdbm")
-	if err != nil {
-		return nil, err
-	}
-
-	ms.stateStore = stateStore
-	return ms.stateStore, nil
-}
-
-func (ms *MenuStorageService) EnsureDbDir() error {
-	err := os.MkdirAll(ms.dbDir, 0700)
-	if err != nil {
-		return fmt.Errorf("state dir create exited with error: %v\n", err)
-	}
-	return nil
-}
-
-func (ms *MenuStorageService) Close() error {
-	errA := ms.stateStore.Close()
-	errB := ms.userDataStore.Close()
-	errC := ms.resourceStore.Close()
-	if errA != nil || errB != nil || errC != nil {
-		return fmt.Errorf("%v %v %v", errA, errB, errC)
-	}
-	return nil
-}

internal/testutil/TestEngine.go

@@ -1,124 +0,0 @@
-package testutil
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path"
-	"time"
-
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/internal/handlers"
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-	"git.grassecon.net/urdt/ussd/internal/storage"
-	"git.grassecon.net/urdt/ussd/internal/testutil/testservice"
-	"git.grassecon.net/urdt/ussd/internal/testutil/testtag"
-	testdataloader "github.com/peteole/testdata-loader"
-)
-
-var (
-	baseDir   = testdataloader.GetBasePath()
-	logg      = logging.NewVanilla()
-	scriptDir = path.Join(baseDir, "services", "registration")
-)
-
-func TestEngine(sessionId string) (engine.Engine, func(), chan bool) {
-	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	ctx = context.WithValue(ctx, "Database", "gdbm")
-	pfp := path.Join(scriptDir, "pp.csv")
-
-	var eventChannel = make(chan bool)
-
-	cfg := engine.Config{
-		Root:       "root",
-		SessionId:  sessionId,
-		OutputSize: uint32(160),
-		FlagCount:  uint32(128),
-	}
-
-	dbDir := ".test_state"
-	resourceDir := scriptDir
-	menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
-
-	err := menuStorageService.EnsureDbDir()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	rs, err := menuStorageService.GetResource(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	pe, err := menuStorageService.GetPersister(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	userDataStore, err := menuStorageService.GetUserdataDb(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	dbResource, ok := rs.(*resource.DbResource)
-	if !ok {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
-	lhs.SetDataStore(&userDataStore)
-	lhs.SetPersister(pe)
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	if testtag.AccountService == nil {
-		testtag.AccountService = &server.AccountService{}
-	}
-
-	switch testtag.AccountService.(type) {
-	case *testservice.TestAccountService:
-		go func() {
-			eventChannel <- false
-		}()
-	case *server.AccountService:
-		go func() {
-			time.Sleep(5 * time.Second) // Wait for 5 seconds
-			eventChannel <- true
-		}()
-	default:
-		panic("Unknown account service type")
-	}
-
-	hl, err := lhs.GetHandler(testtag.AccountService)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	en := lhs.GetEngine()
-	en = en.WithFirst(hl.Init)
-	cleanFn := func() {
-		err := en.Finish()
-		if err != nil {
-			logg.Errorf(err.Error())
-		}
-
-		err = menuStorageService.Close()
-		if err != nil {
-			logg.Errorf(err.Error())
-		}
-		logg.Infof("testengine storage closed")
-	}
-	return en, cleanFn, eventChannel
-}

internal/testutil/driver/groupdriver.go

@@ -1,111 +0,0 @@
-package driver
-
-import (
-	"encoding/json"
-	"log"
-	"os"
-	"regexp"
-)
-
-type Step struct {
-	Input           string `json:"input"`
-	ExpectedContent string `json:"expectedContent"`
-}
-
-func (s *Step) MatchesExpectedContent(content []byte) (bool, error) {
-	pattern := regexp.QuoteMeta(s.ExpectedContent)
-	re, err := regexp.Compile(pattern)
-	if err != nil {
-		return false, err
-	}
-	if re.Match([]byte(content)) {
-		return true, nil
-	}
-	return false, nil
-}
-
-// Group represents a group of steps
-type Group struct {
-	Name  string `json:"name"`
-	Steps []Step `json:"steps"`
-}
-
-type TestCase struct {
-	Name            string
-	Input           string
-	ExpectedContent string
-}
-
-func (s *TestCase) MatchesExpectedContent(content []byte) (bool, error) {
-	pattern := regexp.QuoteMeta(s.ExpectedContent)
-	re, err := regexp.Compile(pattern)
-	if err != nil {
-		return false, err
-	}
-	// Check if the content matches the regex pattern
-	if re.Match(content) {
-		return true, nil
-	}
-	return false, nil
-}
-
-// DataGroup represents the overall structure of the JSON.
-type DataGroup struct {
-	Groups []Group `json:"groups"`
-}
-
-type Session struct {
-	Name   string  `json:"name"`
-	Groups []Group `json:"groups"`
-}
-
-func ReadData() []Session {
-	data, err := os.ReadFile("test_setup.json")
-	if err != nil {
-		log.Fatalf("Failed to read file: %v", err)
-	}
-	// Unmarshal JSON data
-	var sessions []Session
-	err = json.Unmarshal(data, &sessions)
-	if err != nil {
-		log.Fatalf("Failed to unmarshal JSON: %v", err)
-	}
-
-	return sessions
-}
-
-func FilterGroupsByName(groups []Group, name string) []Group {
-	var filteredGroups []Group
-	for _, group := range groups {
-		if group.Name == name {
-			filteredGroups = append(filteredGroups, group)
-		}
-	}
-	return filteredGroups
-}
-
-func LoadTestGroups(filePath string) (DataGroup, error) {
-	var sessionsData DataGroup
-	data, err := os.ReadFile(filePath)
-	if err != nil {
-		return sessionsData, err
-	}
-	err = json.Unmarshal(data, &sessionsData)
-	return sessionsData, err
-}
-
-func CreateTestCases(group DataGroup) []TestCase {
-	var tests []TestCase
-	for _, group := range group.Groups {
-		for _, step := range group.Steps {
-			// Create a test case for each group
-			tests = append(tests, TestCase{
-				Name:            group.Name,
-				Input:           step.Input,
-				ExpectedContent: step.ExpectedContent,
-			})
-		}
-	}
-
-	return tests
-}

internal/testutil/mocks/httpmocks/enginemock.go

@@ -1,30 +0,0 @@
-package httpmocks
-
-import (
-	"context"
-	"io"
-)
-
-// MockEngine implements the engine.Engine interface for testing
-type MockEngine struct {
-	InitFunc   func(context.Context) (bool, error)
-	ExecFunc   func(context.Context, []byte) (bool, error)
-	FlushFunc  func(context.Context, io.Writer) (int, error)
-	FinishFunc func() error
-}
-
-func (m *MockEngine) Init(ctx context.Context) (bool, error) {
-	return m.InitFunc(ctx)
-}
-
-func (m *MockEngine) Exec(ctx context.Context, input []byte) (bool, error) {
-	return m.ExecFunc(ctx, input)
-}
-
-func (m *MockEngine) Flush(ctx context.Context, w io.Writer) (int, error) {
-	return m.FlushFunc(ctx, w)
-}
-
-func (m *MockEngine) Finish() error {
-	return m.FinishFunc()
-}

internal/testutil/mocks/httpmocks/requesthandlermock.go

@@ -1,47 +0,0 @@
-package httpmocks
-
-import (
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/urdt/ussd/internal/handlers"
-)
-
-// MockRequestHandler implements handlers.RequestHandler interface for testing
-type MockRequestHandler struct {
-	ProcessFunc          func(handlers.RequestSession) (handlers.RequestSession, error)
-	GetConfigFunc        func() engine.Config
-	GetEngineFunc        func(cfg engine.Config, rs resource.Resource, pe *persist.Persister) engine.Engine
-	OutputFunc           func(rs handlers.RequestSession) (handlers.RequestSession, error)
-	ResetFunc            func(rs handlers.RequestSession) (handlers.RequestSession, error)
-	ShutdownFunc         func()
-	GetRequestParserFunc func() handlers.RequestParser
-}
-
-func (m *MockRequestHandler) Process(rqs handlers.RequestSession) (handlers.RequestSession, error) {
-	return m.ProcessFunc(rqs)
-}
-
-func (m *MockRequestHandler) GetConfig() engine.Config {
-	return m.GetConfigFunc()
-}
-
-func (m *MockRequestHandler) GetEngine(cfg engine.Config, rs resource.Resource, pe *persist.Persister) engine.Engine {
-	return m.GetEngineFunc(cfg, rs, pe)
-}
-
-func (m *MockRequestHandler) Output(rs handlers.RequestSession) (handlers.RequestSession, error) {
-	return m.OutputFunc(rs)
-}
-
-func (m *MockRequestHandler) Reset(rs handlers.RequestSession) (handlers.RequestSession, error) {
-	return m.ResetFunc(rs)
-}
-
-func (m *MockRequestHandler) Shutdown() {
-	m.ShutdownFunc()
-}
-
-func (m *MockRequestHandler) GetRequestParser() handlers.RequestParser {
-	return m.GetRequestParserFunc()
-}

internal/testutil/mocks/httpmocks/requestparsermock.go

@@ -1,15 +0,0 @@
-package httpmocks
-
-// MockRequestParser implements the handlers.RequestParser interface for testing
-type MockRequestParser struct {
-	GetSessionIdFunc func(any) (string, error)
-	GetInputFunc     func(any) ([]byte, error)
-}
-
-func (m *MockRequestParser) GetSessionId(rq any) (string, error) {
-	return m.GetSessionIdFunc(rq)
-}
-
-func (m *MockRequestParser) GetInput(rq any) ([]byte, error) {
-	return m.GetInputFunc(rq)
-}

internal/testutil/mocks/httpmocks/writermock.go

@@ -1,25 +0,0 @@
-package httpmocks
-
-import "net/http"
-
-// MockWriter implements a mock io.Writer for testing
-type MockWriter struct {
-	WriteStringCalled bool
-	WrittenString     string
-}
-
-func (m *MockWriter) Write(p []byte) (n int, err error) {
-	return len(p), nil
-}
-
-func (m *MockWriter) WriteString(s string) (n int, err error) {
-	m.WriteStringCalled = true
-	m.WrittenString = s
-	return len(s), nil
-}
-
-func (m *MockWriter) Header() http.Header {
-	return http.Header{}
-}
-
-func (m *MockWriter) WriteHeader(statusCode int) {}

internal/testutil/mocks/servicemock.go

@@ -1,40 +0,0 @@
-package mocks
-
-import (
-	"context"
-
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
-	"github.com/stretchr/testify/mock"
-)
-
-// MockAccountService implements AccountServiceInterface for testing
-type MockAccountService struct {
-	mock.Mock
-}
-
-func (m *MockAccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
-	args := m.Called()
-	return args.Get(0).(*api.OKResponse), args.Error(1)
-}
-
-func (m *MockAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
-	args := m.Called(publicKey)
-	return args.Get(0).(*models.BalanceResponse), args.Error(1)
-}
-
-func (m *MockAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
-	args := m.Called(trackingId)
-	return args.Get(0).(*models.TrackStatusResponse), args.Error(1)
-}
-
-func (m *MockAccountService) TrackAccountStatus(ctx context.Context,publicKey string) (*api.OKResponse, error) {
-	args := m.Called(publicKey)
-	return args.Get(0).(*api.OKResponse), args.Error(1)
-}
-
-
-func (m *MockAccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
-	args := m.Called(publicKey)
-	return args.Get(0).(*models.VoucherHoldingResponse), args.Error(1)
-}

internal/testutil/mocks/subprefixdbmock.go

@@ -1,21 +0,0 @@
-package mocks
-
-import (
-	"context"
-
-	"github.com/stretchr/testify/mock"
-)
-
-type MockSubPrefixDb struct {
-	mock.Mock
-}
-
-func (m *MockSubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
-	args := m.Called(ctx, key)
-	return args.Get(0).([]byte), args.Error(1)
-}
-
-func (m *MockSubPrefixDb) Put(ctx context.Context, key, val []byte) error {
-	args := m.Called(ctx, key, val)
-	return args.Error(0)
-}

internal/testutil/testservice/TestAccountService.go

@@ -1,90 +0,0 @@
-package testservice
-
-import (
-	"context"
-	"encoding/json"
-	"time"
-
-	"git.grassecon.net/urdt/ussd/internal/models"
-	"github.com/grassrootseconomics/eth-custodial/pkg/api"
-	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
-)
-
-type TestAccountService struct {
-}
-
-func (tas *TestAccountService) CreateAccount(ctx context.Context) (*api.OKResponse, error) {
-	return &api.OKResponse{
-		Ok:          true,
-		Description: "Account creation succeeded",
-		Result: map[string]any{
-			"trackingId": "075ccc86-f6ef-4d33-97d5-e91cfb37aa0d",
-			"publicKey":  "0x623EFAFa8868df4B934dd12a8B26CB3Dd75A7AdD",
-		},
-	}, nil
-}
-
-func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error) {
-	balanceResponse := &models.BalanceResponse{
-		Ok: true,
-		Result: struct {
-			Balance string      `json:"balance"`
-			Nonce   json.Number `json:"nonce"`
-		}{
-			Balance: "0.003 CELO",
-			Nonce:   json.Number("0"),
-		},
-	}
-
-	return balanceResponse, nil
-}
-
-func (tas *TestAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error) {
-	trackResponse := &models.TrackStatusResponse{
-		Ok: true,
-		Result: struct {
-			Transaction struct {
-				CreatedAt     time.Time   "json:\"createdAt\""
-				Status        string      "json:\"status\""
-				TransferValue json.Number "json:\"transferValue\""
-				TxHash        string      "json:\"txHash\""
-				TxType        string      "json:\"txType\""
-			}
-		}{
-			Transaction: models.Transaction{
-				CreatedAt:     time.Now(),
-				Status:        "SUCCESS",
-				TransferValue: json.Number("0.5"),
-				TxHash:        "0x123abc456def",
-				TxType:        "transfer",
-			},
-		},
-	}
-	return trackResponse, nil
-}
-
-func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
-	return &api.OKResponse{
-		Ok:          true,
-		Description: "Account creation succeeded",
-		Result: map[string]any{
-			"active": true,
-		},
-	}, nil
-}
-
-func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) (*models.VoucherHoldingResponse, error) {
-	return &models.VoucherHoldingResponse{
-		Ok: true,
-		Result: models.VoucherResult{
-			Holdings: []dataserviceapi.TokenHoldings{
-				{
-					ContractAddress: "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
-					TokenSymbol:     "SRF",
-					TokenDecimals:   "6",
-					Balance:         "2745987",
-				},
-			},
-		},
-	}, nil
-}

internal/testutil/testtag/offlinetest.go

@@ -1,12 +0,0 @@
-// +build !online
-
-package testtag
-
-import (
-	"git.grassecon.net/urdt/ussd/internal/handlers/server"
-	accountservice "git.grassecon.net/urdt/ussd/internal/testutil/testservice"
-)
-
-var (
-	AccountService server.AccountServiceInterface = &accountservice.TestAccountService{}
-)

internal/testutil/testtag/onlinetest.go

@@ -1,9 +0,0 @@
-// +build online
-
-package testtag
-
-import "git.grassecon.net/urdt/ussd/internal/handlers/server"
-
-var (
-	AccountService server.AccountServiceInterface
-)

internal/utils/db.go

@@ -22,14 +22,7 @@ const (
 	DATA_OFFERINGS
 	DATA_RECIPIENT
 	DATA_AMOUNT
-	DATA_TEMPORARY_VALUE
-	DATA_VOUCHER_LIST
-	DATA_ACTIVE_SYM
-	DATA_ACTIVE_BAL
-	DATA_PUBLIC_KEY_REVERSE
-	DATA_ACTIVE_DECIMAL
-	DATA_ACTIVE_ADDRESS
-
+	DATA_TEMPORARY_PIN
 )
 
 func typToBytes(typ DataTyp) []byte {

internal/utils/isocode.go

@@ -1,11 +0,0 @@
-package utils
-
-var isoCodes = map[string]bool{
-	"eng": true, // English
-	"swa": true, // Swahili
-
-}
-
-func IsValidISO639(code string) bool {
-	return isoCodes[code]
-}

internal/utils/vouchers.go

@@ -1,146 +0,0 @@
-package utils
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"git.grassecon.net/urdt/ussd/internal/storage"
-	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
-)
-
-// VoucherMetadata helps organize data fields
-type VoucherMetadata struct {
-	Symbols   string
-	Balances  string
-	Decimals  string
-	Addresses string
-}
-
-// ProcessVouchers converts holdings into formatted strings
-func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
-	var data VoucherMetadata
-	var symbols, balances, decimals, addresses []string
-
-	for i, h := range holdings {
-		symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
-		balances = append(balances, fmt.Sprintf("%d:%s", i+1, h.Balance))
-		decimals = append(decimals, fmt.Sprintf("%d:%s", i+1, h.TokenDecimals))
-		addresses = append(addresses, fmt.Sprintf("%d:%s", i+1, h.ContractAddress))
-	}
-
-	data.Symbols = strings.Join(symbols, "\n")
-	data.Balances = strings.Join(balances, "\n")
-	data.Decimals = strings.Join(decimals, "\n")
-	data.Addresses = strings.Join(addresses, "\n")
-
-	return data
-}
-
-// GetVoucherData retrieves and matches voucher data
-func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
-	keys := []string{"sym", "bal", "deci", "addr"}
-	data := make(map[string]string)
-
-	for _, key := range keys {
-		value, err := db.Get(ctx, []byte(key))
-		if err != nil {
-			return nil, fmt.Errorf("failed to get %s: %v", key, err)
-		}
-		data[key] = string(value)
-	}
-
-	symbol, balance, decimal, address := MatchVoucher(input,
-		data["sym"],
-		data["bal"],
-		data["deci"],
-		data["addr"])
-
-	if symbol == "" {
-		return nil, nil
-	}
-
-	return &dataserviceapi.TokenHoldings{
-		TokenSymbol:     string(symbol),
-		Balance:         string(balance),
-		TokenDecimals:   string(decimal),
-		ContractAddress: string(address),
-	}, nil
-}
-
-// MatchVoucher finds the matching voucher symbol, balance, decimals and contract address based on the input.
-func MatchVoucher(input, symbols, balances, decimals, addresses string) (symbol, balance, decimal, address string) {
-	symList := strings.Split(symbols, "\n")
-	balList := strings.Split(balances, "\n")
-	decList := strings.Split(decimals, "\n")
-	addrList := strings.Split(addresses, "\n")
-
-	for i, sym := range symList {
-		parts := strings.SplitN(sym, ":", 2)
-
-		if input == parts[0] || strings.EqualFold(input, parts[1]) {
-			symbol = parts[1]
-			if i < len(balList) {
-				balance = strings.SplitN(balList[i], ":", 2)[1]
-			}
-			if i < len(decList) {
-				decimal = strings.SplitN(decList[i], ":", 2)[1]
-			}
-			if i < len(addrList) {
-				address = strings.SplitN(addrList[i], ":", 2)[1]
-			}
-			break
-		}
-	}
-	return
-}
-
-// StoreTemporaryVoucher saves voucher metadata as temporary entries in the DataStore.
-func StoreTemporaryVoucher(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
-	tempData := fmt.Sprintf("%s,%s,%s,%s", data.TokenSymbol, data.Balance, data.TokenDecimals, data.ContractAddress)
-
-	if err := store.WriteEntry(ctx, sessionId, DATA_TEMPORARY_VALUE, []byte(tempData)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// GetTemporaryVoucherData retrieves temporary voucher metadata from the DataStore.
-func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId string) (*dataserviceapi.TokenHoldings, error) {
-	temp_data, err := store.ReadEntry(ctx, sessionId, DATA_TEMPORARY_VALUE)
-	if err != nil {
-		return nil, err
-	}
-
-	values := strings.SplitN(string(temp_data), ",", 4)
-
-	data := &dataserviceapi.TokenHoldings{}
-
-	data.TokenSymbol = values[0]
-	data.Balance = values[1]
-	data.TokenDecimals = values[2]
-	data.ContractAddress = values[3]
-
-	return data, nil
-}
-
-// UpdateVoucherData sets the active voucher data in the DataStore.
-func UpdateVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
-	// Active voucher data entries
-	activeEntries := map[DataTyp][]byte{
-		DATA_ACTIVE_SYM:     []byte(data.TokenSymbol),
-		DATA_ACTIVE_BAL:     []byte(data.Balance),
-		DATA_ACTIVE_DECIMAL: []byte(data.TokenDecimals),
-		DATA_ACTIVE_ADDRESS: []byte(data.ContractAddress),
-	}
-
-	// Write active data
-	for key, value := range activeEntries {
-		if err := store.WriteEntry(ctx, sessionId, key, value); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

internal/utils/vouchers_test.go

@@ -1,198 +0,0 @@
-package utils
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"git.grassecon.net/urdt/ussd/internal/storage"
-	"github.com/alecthomas/assert/v2"
-	"github.com/stretchr/testify/require"
-
-	memdb "git.defalsify.org/vise.git/db/mem"
-	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
-)
-
-// InitializeTestDb sets up and returns an in-memory database and store.
-func InitializeTestDb(t *testing.T) (context.Context, *UserDataStore) {
-	ctx := context.Background()
-
-	// Initialize memDb
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	require.NoError(t, err, "Failed to connect to memDb")
-
-	// Create UserDataStore with memDb
-	store := &UserDataStore{Db: db}
-
-	t.Cleanup(func() {
-		db.Close() // Ensure the DB is closed after each test
-	})
-
-	return ctx, store
-}
-
-func TestMatchVoucher(t *testing.T) {
-	symbols := "1:SRF\n2:MILO"
-	balances := "1:100\n2:200"
-	decimals := "1:6\n2:4"
-	addresses := "1:0xd4c288865Ce\n2:0x41c188d63Qa"
-
-	// Test for valid voucher
-	symbol, balance, decimal, address := MatchVoucher("2", symbols, balances, decimals, addresses)
-
-	// Assertions for valid voucher
-	assert.Equal(t, "MILO", symbol)
-	assert.Equal(t, "200", balance)
-	assert.Equal(t, "4", decimal)
-	assert.Equal(t, "0x41c188d63Qa", address)
-
-	// Test for non-existent voucher
-	symbol, balance, decimal, address = MatchVoucher("3", symbols, balances, decimals, addresses)
-
-	// Assertions for non-match
-	assert.Equal(t, "", symbol)
-	assert.Equal(t, "", balance)
-	assert.Equal(t, "", decimal)
-	assert.Equal(t, "", address)
-}
-
-func TestProcessVouchers(t *testing.T) {
-	holdings := []dataserviceapi.TokenHoldings{
-		{ContractAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100"},
-		{ContractAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
-	}
-
-	expectedResult := VoucherMetadata{
-		Symbols:   "1:SRF\n2:MILO",
-		Balances:  "1:100\n2:200",
-		Decimals:  "1:6\n2:4",
-		Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
-	}
-
-	result := ProcessVouchers(holdings)
-
-	assert.Equal(t, expectedResult, result)
-}
-
-func TestGetVoucherData(t *testing.T) {
-	ctx := context.Background()
-
-	db := memdb.NewMemDb()
-	err := db.Connect(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
-
-	// Test voucher data
-	mockData := map[string][]byte{
-		"sym":  []byte("1:SRF\n2:MILO"),
-		"bal":  []byte("1:100\n2:200"),
-		"deci": []byte("1:6\n2:4"),
-		"addr": []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
-	}
-
-	// Put the data
-	for key, value := range mockData {
-		err = spdb.Put(ctx, []byte(key), []byte(value))
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	result, err := GetVoucherData(ctx, spdb, "1")
-
-	assert.NoError(t, err)
-	assert.Equal(t, "SRF", result.TokenSymbol)
-	assert.Equal(t, "100", result.Balance)
-	assert.Equal(t, "6", result.TokenDecimals)
-	assert.Equal(t, "0xd4c288865Ce", result.ContractAddress)
-}
-
-func TestStoreTemporaryVoucher(t *testing.T) {
-	ctx, store := InitializeTestDb(t)
-	sessionId := "session123"
-
-	// Test data
-	voucherData := &dataserviceapi.TokenHoldings{
-		TokenSymbol:     "SRF",
-		Balance:         "200",
-		TokenDecimals:   "6",
-		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
-	}
-
-	// Execute the function being tested
-	err := StoreTemporaryVoucher(ctx, store, sessionId, voucherData)
-	require.NoError(t, err)
-
-	// Verify stored data
-	expectedData := fmt.Sprintf("%s,%s,%s,%s", "SRF", "200", "6", "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9")
-
-	storedValue, err := store.ReadEntry(ctx, sessionId, DATA_TEMPORARY_VALUE)
-	require.NoError(t, err)
-	require.Equal(t, expectedData, string(storedValue), "Mismatch for key %v", DATA_TEMPORARY_VALUE)
-
-}
-
-func TestGetTemporaryVoucherData(t *testing.T) {
-	ctx, store := InitializeTestDb(t)
-	sessionId := "session123"
-
-	// Test voucher data
-	tempData := &dataserviceapi.TokenHoldings{
-		TokenSymbol:     "SRF",
-		Balance:         "200",
-		TokenDecimals:   "6",
-		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
-	}
-
-	// Store the data
-	err := StoreTemporaryVoucher(ctx, store, sessionId, tempData)
-	require.NoError(t, err)
-
-	// Execute the function being tested
-	data, err := GetTemporaryVoucherData(ctx, store, sessionId)
-	require.NoError(t, err)
-	require.Equal(t, tempData, data)
-}
-
-func TestUpdateVoucherData(t *testing.T) {
-	ctx, store := InitializeTestDb(t)
-	sessionId := "session123"
-
-	// New voucher data
-	newData := &dataserviceapi.TokenHoldings{
-		TokenSymbol:     "SRF",
-		Balance:         "200",
-		TokenDecimals:   "6",
-		ContractAddress: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
-	}
-
-	// Old temporary data
-	tempData := &dataserviceapi.TokenHoldings{
-		TokenSymbol:     "OLD",
-		Balance:         "100",
-		TokenDecimals:   "8",
-		ContractAddress: "0xold",
-	}
-	require.NoError(t, StoreTemporaryVoucher(ctx, store, sessionId, tempData))
-
-	// Execute update
-	err := UpdateVoucherData(ctx, store, sessionId, newData)
-	require.NoError(t, err)
-
-	// Verify active data was stored correctly
-	activeEntries := map[DataTyp][]byte{
-		DATA_ACTIVE_SYM:     []byte(newData.TokenSymbol),
-		DATA_ACTIVE_BAL:     []byte(newData.Balance),
-		DATA_ACTIVE_DECIMAL: []byte(newData.TokenDecimals),
-		DATA_ACTIVE_ADDRESS: []byte(newData.ContractAddress),
-	}
-
-	for key, expectedValue := range activeEntries {
-		storedValue, err := store.ReadEntry(ctx, sessionId, key)
-		require.NoError(t, err)
-		require.Equal(t, expectedValue, storedValue, "Active data mismatch for key %v", key)
-	}
-}

menutraversal_test/group_test.json

@@ -1,460 +0,0 @@
-{
-    "groups": [
-        {
-            "name": "my_account_change_pin",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n3:Guard my PIN\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter your old PIN\n\n0:Back"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Enter a new four number PIN:\n\n0:Back"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Confirm your new PIN:\n\n0:Back"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Your PIN change request has been successful\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_language_change",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Select language:\n0:english\n1:kiswahili"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "Your language change request was successful.\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_check_my_balance",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Your balance is 0.003 CELO\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                     "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                    
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_check_community_balance",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Your community balance is 0.003 CELO\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                     "expectedContent": "Balances:\n1:My balance\n2:Community balance\n0:Back"
-                    
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_firstname",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter your first names:\n0:Back"
-                },
-                {
-                    "input": "foo",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_familyname",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Enter family name:\n0:Back"
-                },
-                {
-                    "input": "bar",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-               
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_gender",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_yob",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "4",
-                    "expectedContent": "Enter your year of birth\n0:Back"
-                },
-                {
-                    "input": "1945",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_location",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "Enter your location:\n0:Back"
-                },
-                {
-                    "input": "Kilifi",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_edit_offerings",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "6",
-                    "expectedContent": "Enter the services or goods you offer: \n0:Back"
-                },
-                {
-                    "input": "Bananas",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Profile updated successfully\n\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_view_profile",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "7",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 79\nLocation: Kilifi\nYou provide: Bananas\n\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        }
-    ]
-}
-      
-        
-       
-        
-    
-

menutraversal_test/menu_traversal_test.go

@@ -1,380 +0,0 @@
-package menutraversaltest
-
-import (
-	"bytes"
-	"context"
-	"log"
-	"math/rand"
-	"os"
-	"regexp"
-	"testing"
-
-	"git.grassecon.net/urdt/ussd/internal/testutil"
-	"git.grassecon.net/urdt/ussd/internal/testutil/driver"
-	"github.com/gofrs/uuid"
-)
-
-var (
-	testData      = driver.ReadData()
-	testStore     = ".test_state"
-	groupTestFile = "group_test.json"
-	sessionID     string
-	src           = rand.NewSource(42)
-	g             = rand.New(src)
-)
-
-func GenerateSessionId() string {
-	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
-	v, err := uu.NewV4()
-	if err != nil {
-		panic(err)
-	}
-	return v.String()
-}
-
-// Extract the public key from the engine response
-func extractPublicKey(response []byte) string {
-	// Regex pattern to match the public key starting with 0x and 40 characters
-	re := regexp.MustCompile(`0x[a-fA-F0-9]{40}`)
-	match := re.Find(response)
-	if match != nil {
-		return string(match)
-	}
-	return ""
-}
-
-// Extracts the balance value from the engine response.
-func extractBalance(response []byte) string {
-	// Regex to match "Balance: <amount> <symbol>" followed by a newline
-	re := regexp.MustCompile(`(?m)^Balance:\s+(\d+(\.\d+)?)\s+([A-Z]+)`)
-	match := re.FindSubmatch(response)
-	if match != nil {
-		return string(match[1]) + " " + string(match[3]) // "<amount> <symbol>"
-	}
-	return ""
-}
-
-// Extracts the Maximum amount value from the engine response.
-func extractMaxAmount(response []byte) string {
-	// Regex to match "Maximum amount: <amount>" followed by a newline
-	re := regexp.MustCompile(`(?m)^Maximum amount:\s+(\d+(\.\d+)?)`)
-	match := re.FindSubmatch(response)
-	if match != nil {
-		return string(match[1]) // "<amount>"
-	}
-	return ""
-}
-
-// Extracts the send amount value from the engine response.
-func extractSendAmount(response []byte) string {
-	// Regex to match the pattern "will receive X.XX SYM from"
-	re := regexp.MustCompile(`will receive (\d+\.\d{2}\s+[A-Z]+) from`)
-	match := re.FindSubmatch(response)
-	if match != nil {
-		return string(match[1]) // Returns "X.XX SYM"
-	}
-	return ""
-}
-
-func TestMain(m *testing.M) {
-	sessionID = GenerateSessionId()
-	defer func() {
-		if err := os.RemoveAll(testStore); err != nil {
-			log.Fatalf("Failed to delete state store %s: %v", testStore, err)
-		}
-	}()
-	m.Run()
-}
-
-func TestAccountCreationSuccessful(t *testing.T) {
-	en, fn, eventChannel := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "account_creation_successful")
-		for _, group := range groups {
-			for _, step := range group.Steps {
-				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)
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				_, err = en.Flush(ctx, w)
-				if err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-				b := w.Bytes()
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-	<-eventChannel
-
-}
-
-func TestAccountRegistrationRejectTerms(t *testing.T) {
-	// Generate a new UUID for this edge case test
-	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
-	v, err := uu.NewV4()
-	if err != nil {
-		t.Fail()
-	}
-	edgeCaseSessionID := v.String()
-	en, fn, _ := testutil.TestEngine(edgeCaseSessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "account_creation_reject_terms")
-		for _, group := range groups {
-			for _, step := range group.Steps {
-				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)
-					return
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				if _, err := en.Flush(ctx, w); err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-
-				b := w.Bytes()
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-}
-
-func TestMainMenuHelp(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "main_menu_help")
-		for _, group := range groups {
-			for _, step := range group.Steps {
-				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)
-					return
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				if _, err := en.Flush(ctx, w); err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-
-				b := w.Bytes()
-				balance := extractBalance(b)
-
-				expectedContent := []byte(step.ExpectedContent)
-				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-
-				step.ExpectedContent = string(expectedContent)
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-}
-
-func TestMainMenuQuit(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "main_menu_quit")
-		for _, group := range groups {
-			for _, step := range group.Steps {
-				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)
-					return
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				if _, err := en.Flush(ctx, w); err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-
-				b := w.Bytes()
-				balance := extractBalance(b)
-
-				expectedContent := []byte(step.ExpectedContent)
-				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-
-				step.ExpectedContent = string(expectedContent)
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-}
-
-func TestMyAccount_MyAddress(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "menu_my_account_my_address")
-		for _, group := range groups {
-			for index, step := range group.Steps {
-				t.Logf("step %v with input %v", index, step.Input)
-				cont, err := en.Exec(ctx, []byte(step.Input))
-				if err != nil {
-					t.Errorf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
-					return
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				if _, err := en.Flush(ctx, w); err != nil {
-					t.Errorf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-				b := w.Bytes()
-
-				balance := extractBalance(b)
-				publicKey := extractPublicKey(b)
-
-				expectedContent := []byte(step.ExpectedContent)
-				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{public_key}"), []byte(publicKey), -1)
-
-				step.ExpectedContent = string(expectedContent)
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", expectedContent, b)
-				}
-			}
-		}
-	}
-}
-
-func TestMainMenuSend(t *testing.T) {
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "send_with_invalid_inputs")
-		for _, group := range groups {
-			for _, step := range group.Steps {
-				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)
-					return
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				if _, err := en.Flush(ctx, w); err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-
-				b := w.Bytes()
-				balance := extractBalance(b)
-				max_amount := extractMaxAmount(b)
-				send_amount := extractSendAmount(b)
-
-				expectedContent := []byte(step.ExpectedContent)
-				expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{max_amount}"), []byte(max_amount), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{send_amount}"), []byte(send_amount), -1)
-				expectedContent = bytes.Replace(expectedContent, []byte("{session_id}"), []byte(sessionID), -1)
-
-				step.ExpectedContent = string(expectedContent)
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-}
-
-func TestGroups(t *testing.T) {
-	groups, err := driver.LoadTestGroups(groupTestFile)
-	if err != nil {
-		log.Fatalf("Failed to load test groups: %v", err)
-	}
-	en, fn, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	// Create test cases from loaded groups
-	tests := driver.CreateTestCases(groups)
-	for _, tt := range tests {
-		t.Run(tt.Name, func(t *testing.T) {
-			cont, err := en.Exec(ctx, []byte(tt.Input))
-			if err != nil {
-				t.Errorf("Test case '%s' failed at input '%s': %v", tt.Name, tt.Input, err)
-				return
-			}
-			if !cont {
-				return
-			}
-			w := bytes.NewBuffer(nil)
-			if _, err := en.Flush(ctx, w); err != nil {
-				t.Errorf("Test case '%s' failed during Flush: %v", tt.Name, err)
-			}
-			b := w.Bytes()
-			balance := extractBalance(b)
-
-			expectedContent := []byte(tt.ExpectedContent)
-			expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-
-			tt.ExpectedContent = string(expectedContent)
-
-			match, err := tt.MatchesExpectedContent(b)
-			if err != nil {
-				t.Fatalf("Error compiling regex for step '%s': %v", tt.Input, err)
-			}
-			if !match {
-				t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", tt.ExpectedContent, b)
-			}
-		})
-	}
-}

menutraversal_test/test_setup.json

@@ -1,153 +0,0 @@
-[
-    {
-        "name": "session one",
-        "groups": [
-            {
-                "name": "account_creation_successful",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "Please enter a new four number PIN for your account:\n0:Exit"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Enter your four number PIN again:"
-                    },
-                    {
-                        "input": "1111",
-                        "expectedContent": "The PIN is not a match. Try again\n1:retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "Enter your four number PIN again:"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Your account is being created...Thank you for using Sarafu. Goodbye!"
-                    }
-                ]
-            },
-            {
-                "name": "account_creation_reject_terms",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:english\n1:kiswahili"
-                    },
-                    {
-                        "input": "0",
-                        "expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
-                    }
-                ]
-            },
-            {
-                "name": "send_with_invalid_inputs",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "Enter recipient's phone number:\n0:Back"
-                    },
-                    {
-                        "input": "000",
-                        "expectedContent": "000 is not registered or invalid, please try again:\n1:retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "Enter recipient's phone number:\n0:Back"
-                    },
-                    {
-                        "input": "065656",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
-                    },
-                    {
-                        "input": "10000000",
-                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "{max_amount}\nEnter amount:\n0:Back"
-                    },
-                    {
-                        "input": "1.00",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "1222",
-                        "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
-                    },
-                    {
-                        "input": "1",
-                        "expectedContent": "065656 will receive {send_amount} from {session_id}\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
-                    },
-                    {
-                        "input": "1234",
-                        "expectedContent": "Your request has been sent. 065656 will receive {send_amount} from {session_id}."
-                    }
-                ]
-            },
-            {
-                "name": "main_menu_help",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "4",
-                        "expectedContent": "For more help,please call: 0757628885"
-                    }
-                ]
-            },
-            {
-                "name": "main_menu_quit",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "9",
-                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
-                    }
-                ]
-            },
-            {
-                "name": "menu_my_account_my_address",
-                "steps": [
-                    {
-                        "input": "",
-                        "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                    },
-                    {
-                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
-                    },
-                    {
-                        "input": "6",
-                        "expectedContent": "Address: {public_key}\n9:Quit"
-                    },
-                    {
-                        "input": "9",
-                        "expectedContent": "Thank you for using Sarafu. Goodbye!"
-                    }
-                ]
-            }
-        ]
-    }
-]

sample_tokens.json

@@ -1,44 +0,0 @@
-{
-    "ok": true,
-    "description": "Token holdings with current balances",
-    "result": {
-      "holdings": [
-        {
-          "contractAddress": "0x6CC75A06ac72eB4Db2eE22F781F5D100d8ec03ee",
-          "tokenSymbol": "FSPTST",
-          "tokenDecimals": "6",
-          "balance": "8869964242"
-        },
-        {
-          "contractAddress": "0x724F2910D790B54A39a7638282a45B1D83564fFA",
-          "tokenSymbol": "GEO",
-          "tokenDecimals": "6",
-          "balance": "9884"
-        },
-        {
-          "contractAddress": "0x2105a206B7bec31E2F90acF7385cc8F7F5f9D273",
-          "tokenSymbol": "MFNK",
-          "tokenDecimals": "6",
-          "balance": "19788697"
-        },
-        {
-          "contractAddress": "0x63DE2Ac8D1008351Cc69Fb8aCb94Ba47728a7E83",
-          "tokenSymbol": "MILO",
-          "tokenDecimals": "6",
-          "balance": "75"
-        },
-        {
-          "contractAddress": "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
-          "tokenSymbol": "SOHAIL",
-          "tokenDecimals": "6",
-          "balance": "27874115"
-        },
-        {
-          "contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
-          "tokenSymbol": "SRF",
-          "tokenDecimals": "6",
-          "balance": "2745987"
-        }
-      ]
-    }
-  }

services/registration/_catch

@@ -1 +0,0 @@
-Something went wrong.Please try again

services/registration/_catch.vis

@@ -1 +0,0 @@
-HALT

services/registration/account_creation.vis

@@ -1,4 +1,4 @@
-RELOAD verify_create_pin
+RELOAD verify_pin
 CATCH create_pin_mismatch flag_pin_mismatch 1
 LOAD quit 0
 HALT

services/registration/amount.vis

@@ -1,15 +1,12 @@
 LOAD reset_transaction_amount 0
 LOAD max_amount 10
-RELOAD max_amount
 MAP max_amount
 MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure  flag_api_call_error  1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 12
 LOAD get_sender 64
-LOAD get_amount 32
 INCMP transaction_pin *

services/registration/api_failure

@@ -1 +0,0 @@
-Failed to connect to the custodial service.Please try again.

services/registration/api_failure.vis

@@ -1,5 +0,0 @@
-MOUT retry 0
-MOUT quit 9
-HALT
-INCMP _ 0
-INCMP quit 9

services/registration/balances.vis

@@ -1,5 +1,4 @@
 LOAD reset_account_authorized 0
-RELOAD reset_account_authorized
 MOUT my_balance 1
 MOUT community_balance 2
 MOUT back 0

services/registration/community_balance

@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+Your community balance is: 0.00SRF

services/registration/community_balance.vis

@@ -1,11 +1,5 @@
-LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
-CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
-MOUT back 0
-MOUT quit 9
+LOAD quit_with_balance 0
 HALT
-INCMP _ 0
-INCMP quit 9

services/registration/confirm_create_pin.vis

@@ -1,4 +1,4 @@
-LOAD save_temporary_pin 6
+LOAD save_pin 0
 HALT
-LOAD verify_create_pin 8
+LOAD verify_pin 8
 INCMP account_creation *

services/registration/create_pin.vis

@@ -2,8 +2,8 @@ LOAD create_account 0
 CATCH account_creation_failed flag_account_creation_failed 1
 MOUT exit 0
 HALT
-LOAD save_temporary_pin 6
-RELOAD save_temporary_pin
+LOAD save_pin 0
+RELOAD save_pin
 CATCH . flag_incorrect_pin 1
 INCMP quit 0
 INCMP confirm_create_pin *

services/registration/edit_familyname_menu

@@ -1 +0,0 @@
-Edit family name

services/registration/edit_familyname_menu_swa

@@ -1 +0,0 @@
-Weka jina la familia

services/registration/edit_profile.vis

@@ -1,21 +1,20 @@
 LOAD reset_account_authorized 16
-RELOAD reset_account_authorized
 LOAD reset_allow_update 0
 RELOAD reset_allow_update
 MOUT edit_name 1
-MOUT edit_familyname 2
-MOUT edit_gender 3
-MOUT edit_yob 4
-MOUT edit_location 5
-MOUT edit_offerings 6
-MOUT view 7
+MOUT edit_gender 2
+MOUT edit_yob 3
+MOUT edit_location 4
+MOUT edit_offerings 5
+MOUT view 6
 MOUT back 0
 HALT
-INCMP my_account 0
+INCMP _ 0
+LOAD set_reset_single_edit 0
+RELOAD set_reset_single_edit
 INCMP enter_name 1
-INCMP enter_familyname 2
-INCMP select_gender 3
-INCMP enter_yob 4
-INCMP enter_location 5
-INCMP enter_offerings 6
-INCMP view_profile 7
+INCMP select_gender 2
+INCMP enter_yob 3
+INCMP enter_location 4
+INCMP enter_offerings 5
+INCMP view_profile 6

services/registration/enter_familyname.vis

@@ -1,8 +1,5 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_familyname flag_allow_update 1
+LOAD save_firstname 0
 MOUT back 0
 HALT
-LOAD save_familyname 0
-RELOAD save_familyname
 INCMP _ 0
-INCMP pin_entry *
+INCMP select_gender *

services/registration/enter_familyname_swa

@@ -1 +0,0 @@
-Weka jina la familia

services/registration/enter_location.vis

@@ -1,8 +1,9 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_location flag_allow_update 1
+CATCH incorrect_date_format flag_incorrect_date_format 1
+LOAD save_yob 0
+CATCH update_success flag_allow_update 1
 MOUT back 0
 HALT
-LOAD save_location 0
-RELOAD save_location
 INCMP _ 0
-INCMP pin_entry *
+LOAD save_location 0
+CATCH pin_entry flag_single_edit 1
+INCMP enter_offerings *

services/registration/enter_name.vis

@@ -1,8 +1,4 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_firstname flag_allow_update 1
 MOUT back 0
 HALT
-LOAD save_firstname 0
-RELOAD save_firstname
 INCMP _ 0
-INCMP pin_entry *
+INCMP enter_familyname *

services/registration/enter_offerings.vis

@@ -1,8 +1,8 @@
+LOAD save_location 0
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_offerings flag_allow_update 1
-LOAD save_offerings 0
+CATCH update_success flag_allow_update 1
 MOUT back 0
 HALT
-RELOAD save_offerings
+LOAD save_offerings 0
 INCMP _ 0
 INCMP pin_entry *

services/registration/enter_yob.vis

@@ -1,10 +1,9 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_yob flag_allow_update 1
+LOAD save_gender 0
+CATCH update_success flag_allow_update 1
 MOUT back 0
 HALT
-LOAD verify_yob 0
-CATCH incorrect_date_format flag_incorrect_date_format 1
-LOAD save_yob 0
-RELOAD save_yob
 INCMP _ 0
-INCMP pin_entry *
+LOAD verify_yob 8
+LOAD save_yob 0
+CATCH pin_entry flag_single_edit 1
+INCMP enter_location *

services/registration/locale/swa/default.po

@@ -1,14 +1,12 @@
 msgid "Your account balance is %s"
 msgstr "Salio lako ni %s"
 
-msgid "Your request has been sent. %s will receive %s %s from %s."
-msgstr "Ombi lako limetumwa. %s atapokea %s %s kutoka kwa %s."
+msgid "Your request has been sent. %s will receive %s from %s."
+msgstr "Ombi lako limetumwa. %s atapokea %s kutoka kwa %s."
 
 msgid "Thank you for using Sarafu. Goodbye!"
 msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
 
+
 msgid "For more help,please call: 0757628885"
 msgstr "Kwa usaidizi zaidi,piga: 0757628885"
-
-msgid "Balance: %s\n"
-msgstr "Salio: %s\n"

services/registration/main

@@ -1 +1 @@
-{{.check_balance}}
+Balance: {{.check_balance}}

services/registration/main.vis

@@ -1,10 +1,5 @@
-LOAD set_default_voucher 8
-RELOAD set_default_voucher
 LOAD check_balance 64
 RELOAD check_balance
-LOAD check_vouchers 10
-RELOAD check_vouchers
-CATCH api_failure  flag_api_call_error  1
 MAP check_balance
 MOUT send 1
 MOUT vouchers 2
@@ -13,7 +8,7 @@ MOUT help 4
 MOUT quit 9
 HALT
 INCMP send 1
-INCMP my_vouchers 2
+INCMP quit 2
 INCMP my_account 3
 INCMP help 4
 INCMP quit 9

services/registration/main_swa

@@ -1 +1 @@
-{{.check_balance}}
+Salio: {{.check_balance}}

services/registration/my_account.vis

@@ -7,7 +7,7 @@ MOUT pin_options 5
 MOUT my_address 6
 MOUT back 0
 HALT
-INCMP main 0
+INCMP _ 0
 INCMP edit_profile 1
 INCMP change_language 2
 INCMP balances 3

services/registration/my_balance

@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+Your balance is: 0.00 SRF

services/registration/my_balance.vis

@@ -1,11 +1,5 @@
-LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
-CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
-MOUT back 0
-MOUT quit 9
+LOAD quit_with_balance 0
 HALT
-INCMP _ 0
-INCMP quit 9

services/registration/my_vouchers

@@ -1 +0,0 @@
-My vouchers

services/registration/my_vouchers.vis

@@ -1,8 +0,0 @@
-LOAD reset_account_authorized 16
-RELOAD reset_account_authorized
-MOUT select_voucher 1
-MOUT voucher_details 2
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP select_voucher 1

services/registration/new_pin

@@ -1 +1 @@
-Enter a new four number PIN:
+Enter a new four number pin

services/registration/no_voucher

@@ -1 +0,0 @@
-You need a voucher to send

services/registration/no_voucher.vis

@@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9

services/registration/no_voucher_swa

@@ -1 +0,0 @@
-Unahitaji sarafu kutuma

services/registration/pp.csv

@@ -14,6 +14,3 @@ flag,flag_valid_pin,20,this is set when the given PIN is valid
 flag,flag_allow_update,21,this is set to allow a user to update their profile data
 flag,flag_single_edit,22,this is set to allow a user to edit a single profile item such as year of birth
 flag,flag_incorrect_date_format,23,this is set when the given year of birth is invalid
-flag,flag_incorrect_voucher,24,this is set when the selected voucher is invalid
-flag,flag_api_call_error,25,this is set when communication to an external service fails
-flag,flag_no_active_voucher,26,this is set when a user does not have an active voucher

services/registration/profile_update_success

@@ -1 +0,0 @@
-Profile updated successfully

services/registration/profile_update_success.vis

@@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP edit_profile 0
-INCMP quit 9

services/registration/profile_update_success_swa

@@ -1 +0,0 @@
-Ombi la Kuweka wasifu limefanikiwa

services/registration/root.vis

@@ -1,8 +1,6 @@
 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 account_pending flag_account_pending 1
 CATCH create_pin flag_pin_set 0
 CATCH main flag_account_success 1

services/registration/select_gender.vis

@@ -1,15 +1,13 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+LOAD save_familyname 0
+CATCH update_success flag_allow_update 1
 MOUT male 1
 MOUT female 2
 MOUT unspecified 3
 MOUT back 0
 HALT
+LOAD save_gender 0
+CATCH pin_entry flag_single_edit 1
 INCMP _ 0
-INCMP set_male 1
-INCMP set_female 2
-INCMP set_unspecified 3
-
-
-
-
+INCMP enter_yob 1
+INCMP enter_yob 2
+INCMP enter_yob 3

services/registration/select_language.vis

@@ -1,6 +1,6 @@
 MOUT english 0
 MOUT kiswahili 1
 HALT
-INCMP set_eng 0
+INCMP set_default 0
 INCMP set_swa 1
 INCMP . *

services/registration/select_voucher

@@ -1,2 +0,0 @@
-Select number or symbol from your vouchers:
-{{.get_vouchers}}

services/registration/select_voucher.vis

@@ -1,15 +0,0 @@
-LOAD get_vouchers 0
-MAP get_vouchers
-MOUT back 0
-MOUT quit 99
-MNEXT next 11
-MPREV prev 22
-HALT
-LOAD view_voucher 80
-RELOAD view_voucher
-CATCH . flag_incorrect_voucher 1
-INCMP _ 0
-INCMP quit 99
-INCMP > 11
-INCMP < 22
-INCMP view_voucher *

services/registration/select_voucher_menu

@@ -1 +0,0 @@
-Select voucher

services/registration/select_voucher_swa

@@ -1,2 +0,0 @@
-Chagua nambari au ishara kutoka kwa salio zako:
-{{.get_vouchers}}

services/registration/send.vis

@@ -1,5 +1,4 @@
 LOAD transaction_reset 0
-CATCH no_voucher flag_no_active_voucher 1
 MOUT back 0
 HALT
 LOAD validate_recipient 20

services/registration/set_female.vis

@@ -1,4 +0,0 @@
-LOAD save_gender 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_gender flag_allow_update 1
-MOVE pin_entry

services/registration/set_male.vis

@@ -1,4 +0,0 @@
-LOAD save_gender 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_gender flag_allow_update 1
-MOVE pin_entry

services/registration/set_unspecified.vis

@@ -1,4 +0,0 @@
-LOAD save_gender 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_gender flag_allow_update 1
-MOVE pin_entry

services/registration/transaction_initiated.vis

@@ -1,7 +1,7 @@
 LOAD reset_incorrect 6
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH _ flag_account_authorized 0
-RELOAD get_amount
+LOAD get_amount 10
 MAP get_amount
 RELOAD get_recipient
 MAP get_recipient

services/registration/transaction_pin

@@ -1,2 +1,2 @@
-{{.get_recipient}} will receive {{.get_amount}} from {{.get_sender}}
+{{.get_recipient}} will receive {{.validate_amount}} from {{.get_sender}}
 Please enter your PIN to confirm: