args/lang.go

@@ -21,7 +21,7 @@ func (lv *LangVar) Set(s string) error {
 
 func(lv *LangVar) String() string {
 	var s []string
-	for _, v := range lv.v {
+	for _, v := range(lv.v) {
 		s = append(s, v.Code)
 	}
 	return strings.Join(s, ",")
@@ -30,3 +30,5 @@ func (lv *LangVar) String() string {
 func(lv *LangVar) Langs() []lang.Language {
 	return lv.v
 }
+
+

cmd/africastalking/main.go

@@ -12,18 +12,18 @@ import (
 	"syscall"
 
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	
+	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
-	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 )
 
 var (

cmd/async/main.go

@@ -14,12 +14,12 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
 
 var (

cmd/http/main.go

@@ -17,13 +17,13 @@ import (
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	httprequest "git.grassecon.net/grassrootseconomics/visedriver/request/http"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 )
 
 var (

cmd/main.go

@@ -10,14 +10,14 @@ import (
 	"syscall"
 
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+	"git.defalsify.org/vise.git/lang"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
 
 var (

config/config.go

@@ -1,9 +1,9 @@
 package config
 
 import (
-	apiconfig "git.grassecon.net/grassrootseconomics/sarafu-api/config"
-	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
 	"git.grassecon.net/grassrootseconomics/visedriver/env"
+	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
+	apiconfig "git.grassecon.net/grassrootseconomics/sarafu-api/config"
 )
 
 var (

debug/db.go

@@ -1,11 +1,11 @@
 package debug
 
 import (
-	"encoding/binary"
 	"fmt"
+	"encoding/binary"
 
-	visedb "git.defalsify.org/vise.git/db"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	visedb "git.defalsify.org/vise.git/db"
 )
 
 var (
@@ -53,6 +53,7 @@ func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
 		k = k[2:]
 	}
 
+
 	return o, nil
 }
 

debug/db_debug.go

@@ -1,4 +1,3 @@
-//go:build debugdb
 // +build debugdb
 
 package debug

debug/db_test.go

@@ -3,8 +3,8 @@ package debug
 import (
 	"testing"
 
-	visedb "git.defalsify.org/vise.git/db"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	visedb "git.defalsify.org/vise.git/db"
 )
 
 func TestDebugDbSubKeyInfo(t *testing.T) {

devtools/admin/main.go

@@ -10,9 +10,9 @@ import (
 	"git.defalsify.org/vise.git/logging"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 )
 
 var (

devtools/lang/main.go

@@ -8,12 +8,13 @@ import (
 	"path"
 	"strings"
 
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/lang"
 	"git.grassecon.net/grassrootseconomics/visedriver/config"
 )
 
 const (
+	
 	changeHeadSrc = `LOAD reset_account_authorized 0
 LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
@@ -62,7 +63,7 @@ func main() {
 	}
 	logg.Tracef("using languages", "lang", config.Languages)
 
-	for i, v := range config.Languages {
+	for i, v := range(config.Languages) {
 		ln, err := lang.LanguageFromCode(v)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "error parsing language: %s\n", v)

devtools/store/dump/main.go

@@ -7,11 +7,11 @@ import (
 	"os"
 	"path"
 
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/debug"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/debug"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 var (

handlers/event/custodial.go

@@ -35,6 +35,13 @@ func (eu *EventsUpdater) HandleCustodialRegistration(ctx context.Context, ev *ap
 	if err != nil {
 		return err
 	}
+//	err = pe.Load(identity.SessionId)
+//	if err != nil {
+//		return err
+//	}
+//	st := pe.GetState()
+//	st.SetFlag(accountCreatedFlag)
+//	return pe.Save(identity.SessionId)
 	logg.DebugCtxf(ctx, "received custodial registration event", "identity", identity)
 	return nil
 }

handlers/event/event.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/persist"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	"git.defalsify.org/vise.git/logging"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 )
 
 var (

handlers/event/token.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 
 	"git.defalsify.org/vise.git/db"
-	"git.grassecon.net/grassrootseconomics/common/identity"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	"git.grassecon.net/grassrootseconomics/common/identity"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 )
 
 // execute all 
@@ -47,6 +47,7 @@ func (eu *EventsUpdater) updateToken(ctx context.Context, identity identity.Iden
 	return nil
 }
 
+
 // set default token to given symbol.
 func (eu *EventsUpdater) updateDefaultToken(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore, activeSym string) error {
 	pfxDb := toPrefixDb(userStore, identity.SessionId)
@@ -58,6 +59,7 @@ func (eu *EventsUpdater) updateDefaultToken(ctx context.Context, identity identi
 	return store.UpdateVoucherData(ctx, userStore, identity.SessionId, tokenData)
 }
 
+
 // handle token transfer.
 //
 // if from and to are NOT the same, handle code will be executed once for each side of the transfer.
@@ -187,7 +189,7 @@ func (eu *EventsUpdater) updateTokenTransferList(ctx context.Context, identity i
 		return err
 	}
 
-	for i, tx := range txs {
+	for i, tx := range(txs) {
 		r = append(r, eu.formatFunc(apievent.EventTokenTransferTag, i, tx))
 	}
 

internal/cmd/cmd.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 )
 
 var (
@@ -94,3 +94,5 @@ func (c *Cmd) Parse(args []string) error {
 
 	return fmt.Errorf("unknown subcommand: %s", cmd)
 }
+
+

menutraversal_test/menu_traversal_test.go

@@ -9,10 +9,10 @@ import (
 	"regexp"
 	"testing"
 
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil"
-	"git.grassecon.net/grassrootseconomics/visedriver/testutil/driver"
 	"github.com/gofrs/uuid"
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/driver"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil"
 )
 
 var (

services/local.go

@@ -1,17 +1,16 @@
-//go:build !online
 // +build !online
 
 package services
 
 import (
-	"context"
 	"fmt"
+	"context"
 
-	devremote "git.grassecon.net/grassrootseconomics/sarafu-api/dev"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	devremote "git.grassecon.net/grassrootseconomics/sarafu-api/dev"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 )
 
 type localEmitter struct {

services/remote.go

@@ -1,4 +1,3 @@
-//go:build online
 // +build online
 
 package services
@@ -6,9 +5,9 @@ package services
 import (
 	"context"
 
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 func New(ctx context.Context, storageService storage.StorageService, conn storage.ConnData) remote.AccountService {

ssh/ssh.go

@@ -2,8 +2,8 @@ package ssh
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/hex"
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"net"
@@ -16,9 +16,9 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/state"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )
 
 var (
@@ -61,6 +61,7 @@ func (a *auther) FromConn(c *ssh.ServerConn) (string, error) {
 	return a.Get(c.Conn.SessionID())
 }
 
+
 func(a *auther) Get(k []byte) (string, error) {
 	ka := hex.EncodeToString(k)
 	v, ok := a.auth[ka]

store/tokens_test.go

@@ -3,8 +3,8 @@ package store
 import (
 	"testing"
 
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	"github.com/alecthomas/assert/v2"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 )
 
 func TestParseAndScaleAmount(t *testing.T) {

store/user_store.go

@@ -4,10 +4,10 @@ import (
 	"context"
 
 	visedb "git.defalsify.org/vise.git/db"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	"git.grassecon.net/grassrootseconomics/common/hex"
 	"git.grassecon.net/grassrootseconomics/common/identity"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 )
 
 // TODO: Rename interface, "datastore" is redundant naming and too general

testutil/engine.go

@@ -9,24 +9,24 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/jackc/pgx/v5/pgxpool"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
-	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/testservice"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil/testtag"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"github.com/jackc/pgx/v5/pgxpool"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/testservice"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	httpremote "git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil/testtag"
 )
 
 // CleanDatabase removes all test data from the database
 func CleanDatabase() {
-	for _, v := range []int8{
+	for _, v := range([]int8{
 		storage.STORETYPE_STATE,
 		storage.STORETYPE_USER,
-	} {
+	}) {
 		conn := conns[v]
 		logg.Infof("cleaning test database", "typ", v, "db", conn)
 		if conn.DbType() == storage.DBTYPE_POSTGRES {

testutil/fsdb.go

@@ -1,23 +1,19 @@
-//go:build testfsdb
 // +build testfsdb
 
 package testutil
 
 import (
 	"os"
-)
 
-const (
-	testDbCookie = true
 )
 
 func init() {
-	stateDir, err := os.MkdirTemp("", "sarafu-vise-menutraversal-fs-state-")
+	stateDir, err := os.MkdirTemp("", "sarafu-vise-menutraversal-state-")
 	if err != nil {
 		panic(err)
 	}
 	override.StateConn = &stateDir
-	userDir, err := os.MkdirTemp("", "sarafu-vise-menutraversal-fs-user-")
+	userDir, err := os.MkdirTemp("", "sarafu-vise-menutraversal-user-")
 	if err != nil {
 		panic(err)
 	}

testutil/gdbmdb.go

@@ -1,34 +0,0 @@
-//go:build testgdbmdb
-// +build testgdbmdb
-
-package testutil
-
-import (
-	"net/url"
-	"os"
-)
-
-const (
-	testDbCookie = true
-)
-
-func init() {
-	stateDir, err := os.MkdirTemp("", "sarafu-vise-menutraversal-gdbm-state-")
-	if err != nil {
-		panic(err)
-	}
-	stateDir, err = url.JoinPath("gdbm:///", stateDir)
-	if err != nil {
-		panic(err)
-	}
-	override.StateConn = &stateDir
-	userDir, err := os.MkdirTemp("", "sarafu-vise-menutraversal-gdbm-user-")
-	if err != nil {
-		panic(err)
-	}
-	userDir, err = url.JoinPath("gdbm:///", userDir)
-	if err != nil {
-		panic(err)
-	}
-	override.UserConn = &userDir
-}

testutil/setup.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"path"
 
-	"git.defalsify.org/vise.git/db"
-	fsdb "git.defalsify.org/vise.git/db/fs"
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	testdataloader "github.com/peteole/testdata-loader"
+	"git.defalsify.org/vise.git/logging"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	"git.defalsify.org/vise.git/db"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 )
 
 var (

testutil/testtag/offlinetest.go

@@ -1,4 +1,3 @@
-//go:build !online
 // +build !online
 
 package testtag

testutil/testtag/onlinetest.go

@@ -1,4 +1,3 @@
-//go:build online
 // +build online
 
 package testtag