From 7de55a2e74862d95a3f044c0c80ebf9165fc9c25 Mon Sep 17 00:00:00 2001 From: Mohammed Sohail Date: Wed, 7 May 2025 13:15:55 +0300 Subject: [PATCH] (experimental): replace go-vise with fork --- Dockerfile | 2 +- README.md | 130 ++++++++++++---------- args/lang.go | 2 +- cmd/africastalking/main.go | 28 ++--- cmd/async/main.go | 28 ++--- cmd/http/main.go | 28 ++--- cmd/main.go | 20 ++-- cmd/ssh/main.go | 14 +-- debug/db.go | 2 +- debug/db_debug.go | 2 +- debug/db_test.go | 2 +- devtools/admin/main.go | 2 +- devtools/lang/main.go | 4 +- devtools/store/dump/main.go | 4 +- go.mod | 21 ++-- go.sum | 113 +++++++++++++++---- handlers/application/menuhandler.go | 16 +-- handlers/application/menuhandler_test.go | 14 +-- handlers/event/event.go | 4 +- handlers/event/token.go | 2 +- handlers/local.go | 10 +- internal/cmd/cmd.go | 2 +- internal/sms/sms.go | 2 +- menutraversal_test/menu_traversal_test.go | 2 +- ssh/keystore.go | 3 +- ssh/ssh.go | 12 +- store/db/db.go | 4 +- store/db/sub_prefix_db.go | 2 +- store/db/sub_prefix_db_test.go | 2 +- store/log_db.go | 2 +- store/user_store.go | 2 +- store/vouchers.go | 2 +- store/vouchers_test.go | 2 +- testutil/engine.go | 22 ++-- testutil/setup.go | 6 +- 35 files changed, 299 insertions(+), 214 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7c09597..5e35739 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libgdbm-dev \ git \ && rm -rf /var/lib/apt/lists/* -RUN git clone https://git.defalsify.org/vise.git go-vise +RUN git clone https://github.com/grassrootseconomics/go-vise go-vise COPY . ./sarafu-vise WORKDIR /build/sarafu-vise/services/registration diff --git a/README.md b/README.md index b3a7db9..f4d1ccb 100644 --- a/README.md +++ b/README.md @@ -2,93 +2,103 @@ ![img](https://git.grassecon.net/grassrootseconomics/sarafu-vise/raw/commit/53d09688c1516747488ef8d77bb60aac1d3151c2/doc/modules.svg) -This is a USSD service built using the [go-vise](https://github.com/nolash/go-vise) engine. +This is a USSD service built using the +[go-vise](https://github.com/nolash/go-vise) engine. ## Prerequisites + ### 1. [go-vise](https://github.com/nolash/go-vise) -Set up `go-vise` by cloning the repository into a separate directory. The main upstream repository is hosted at: `https://git.defalsify.org/vise.git` +Set up `go-vise` by cloning the repository into a separate directory. The main +upstream repository is hosted at: +`https://github.com/grassrootseconomics/go-vise` + ``` -git clone https://git.defalsify.org/vise.git +git clone https://github.com/grassrootseconomics/go-vise ``` ## Setup + 1. Clone the ussd repo in its own directory - ``` - git clone https://git.grassecon.net/urdt/ussd.git - ``` + ``` + git clone https://git.grassecon.net/urdt/ussd.git + ``` 2. Navigate to the project directory. 3. Enter the `services/registration` subfolder: - ``` - cd services/registration - ``` + ``` + cd services/registration + ``` 4. make the .bin files from the .vis files - ``` - make VISE_PATH=/var/path/to/your/go-vise -B - ``` + ``` + make VISE_PATH=/var/path/to/your/go-vise -B + ``` 5. Return to the project root (`cd ../..`) -6. Run the USSD menu - ``` - go run cmd/main.go -session-id=0712345678 - ``` +6. Run the USSD menu + ``` + go run cmd/main.go -session-id=0712345678 + ``` + ## Running the different binaries -1. ### CLI: - ``` - go run cmd/main.go -session-id=0712345678 - ``` -2. ### Africastalking: - ``` - go run cmd/africastalking/main.go - ``` -3. ### Async: - ``` - go run cmd/async/main.go - ``` -4. ### Http: - ``` - go run cmd/http/main.go - ``` - + +1. ### CLI: + ``` + go run cmd/main.go -session-id=0712345678 + ``` +2. ### Africastalking: + ``` + go run cmd/africastalking/main.go + ``` +3. ### Async: + ``` + go run cmd/async/main.go + ``` +4. ### Http: + ``` + go run cmd/http/main.go + ``` + ## Flags + Below are the supported flags: -1. `-session-id`: - - Specifies the session ID. (CLI only). - - Default: `075xx2123`. +1. `-session-id`: - Example: - ``` - go run cmd/main.go -session-id=0712345678 - ``` + Specifies the session ID. (CLI only). -2. `-d`: + Default: `075xx2123`. - Enables engine debug output. - - Default: `false`. + Example: + ``` + go run cmd/main.go -session-id=0712345678 + ``` - Example: - ``` - go run cmd/main.go -session-id=0712345678 -d - ``` +2. `-d`: -3. `-db`: + Enables engine debug output. - Specifies the database type. - - Default: `gdbm`. + Default: `false`. - Example: - ``` - go run cmd/main.go -session-id=0712345678 -d -db=postgres - ``` + Example: + ``` + go run cmd/main.go -session-id=0712345678 -d + ``` - >Note: If using `-db=postgres`, ensure PostgreSQL is running with the connection details specified in your `.env` file. +3. `-db`: + + Specifies the database type. + + Default: `gdbm`. + + Example: + ``` + go run cmd/main.go -session-id=0712345678 -d -db=postgres + ``` + + > Note: If using `-db=postgres`, ensure PostgreSQL is running with the + > connection details specified in your `.env` file. ## License -[AGPL-3.0](LICENSE). \ No newline at end of file +[AGPL-3.0](LICENSE). diff --git a/args/lang.go b/args/lang.go index 68efe52..324cf5b 100644 --- a/args/lang.go +++ b/args/lang.go @@ -3,7 +3,7 @@ package args import ( "strings" - "git.defalsify.org/vise.git/lang" + "github.com/grassrootseconomics/go-vise/lang" ) type LangVar struct { diff --git a/cmd/africastalking/main.go b/cmd/africastalking/main.go index 2f34b56..57399a4 100644 --- a/cmd/africastalking/main.go +++ b/cmd/africastalking/main.go @@ -11,10 +11,10 @@ import ( "strconv" "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" + "github.com/grassrootseconomics/go-vise/engine" + "github.com/grassrootseconomics/go-vise/lang" + "github.com/grassrootseconomics/go-vise/logging" + "github.com/grassrootseconomics/go-vise/resource" "git.grassecon.net/grassrootseconomics/sarafu-vise/config" "git.grassecon.net/grassrootseconomics/visedriver/request" @@ -79,10 +79,10 @@ func main() { pfp := path.Join(scriptDir, "pp.csv") cfg := engine.Config{ - Root: "root", - OutputSize: uint32(size), - FlagCount: uint32(128), - MenuSeparator: menuSeparator, + Root: "root", + OutputSize: uint32(size), + FlagCount: uint32(128), + MenuSeparator: menuSeparator, ResetOnEmptyInput: true, } @@ -102,11 +102,11 @@ func main() { fmt.Fprintf(os.Stderr, "userdatadb: %v\n", err) os.Exit(1) } - logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data") - if err != nil { - fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) - os.Exit(1) - } + // logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data") + // if err != nil { + // fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) + // os.Exit(1) + // } dbResource, ok := rs.(*resource.DbResource) if !ok { @@ -120,7 +120,7 @@ func main() { os.Exit(1) } lhs.SetDataStore(&userdataStore) - lhs.SetLogDb(&logdb) + // lhs.SetLogDb(&logdb) if err != nil { fmt.Fprintf(os.Stderr, "setdatastore: %v\n", err) os.Exit(1) diff --git a/cmd/async/main.go b/cmd/async/main.go index 5bb6816..774bc6a 100644 --- a/cmd/async/main.go +++ b/cmd/async/main.go @@ -12,10 +12,10 @@ import ( "strings" "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" + "github.com/grassrootseconomics/go-vise/engine" + "github.com/grassrootseconomics/go-vise/lang" + "github.com/grassrootseconomics/go-vise/logging" + "github.com/grassrootseconomics/go-vise/resource" "git.grassecon.net/grassrootseconomics/sarafu-vise/args" "git.grassecon.net/grassrootseconomics/sarafu-vise/config" @@ -94,10 +94,10 @@ func main() { pfp := path.Join(scriptDir, "pp.csv") cfg := engine.Config{ - Root: "root", - OutputSize: uint32(size), - FlagCount: uint32(128), - MenuSeparator: menuSeparator, + Root: "root", + OutputSize: uint32(size), + FlagCount: uint32(128), + MenuSeparator: menuSeparator, ResetOnEmptyInput: true, } @@ -123,11 +123,11 @@ func main() { os.Exit(1) } - logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data") - if err != nil { - fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) - os.Exit(1) - } + // logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data") + // if err != nil { + // fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) + // os.Exit(1) + // } //defer userdataStore.Close(ctx) dbResource, ok := rs.(*resource.DbResource) @@ -137,7 +137,7 @@ func main() { lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs) lhs.SetDataStore(&userdataStore) - lhs.SetLogDb(&logdb) + // lhs.SetLogDb(&logdb) accountService := services.New(ctx, menuStorageService) hl, err := lhs.GetHandler(accountService) diff --git a/cmd/http/main.go b/cmd/http/main.go index eed729a..aee155b 100644 --- a/cmd/http/main.go +++ b/cmd/http/main.go @@ -11,10 +11,10 @@ import ( "strconv" "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" + "github.com/grassrootseconomics/go-vise/engine" + "github.com/grassrootseconomics/go-vise/lang" + "github.com/grassrootseconomics/go-vise/logging" + "github.com/grassrootseconomics/go-vise/resource" "git.grassecon.net/grassrootseconomics/sarafu-vise/config" "git.grassecon.net/grassrootseconomics/visedriver/request" @@ -80,10 +80,10 @@ func main() { pfp := path.Join(scriptDir, "pp.csv") cfg := engine.Config{ - Root: "root", - OutputSize: uint32(size), - FlagCount: uint32(128), - MenuSeparator: menuSeparator, + Root: "root", + OutputSize: uint32(size), + FlagCount: uint32(128), + MenuSeparator: menuSeparator, ResetOnEmptyInput: true, } @@ -105,11 +105,11 @@ func main() { os.Exit(1) } - logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data") - if err != nil { - fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) - os.Exit(1) - } + // logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data") + // if err != nil { + // fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) + // os.Exit(1) + // } dbResource, ok := rs.(*resource.DbResource) if !ok { @@ -118,7 +118,7 @@ func main() { lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs) lhs.SetDataStore(&userdataStore) - lhs.SetLogDb(&logdb) + // lhs.SetLogDb(&logdb) if err != nil { fmt.Fprintf(os.Stderr, err.Error()) diff --git a/cmd/main.go b/cmd/main.go index 1b40e32..ac04e7a 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -9,15 +9,15 @@ import ( "path" "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.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" + "github.com/grassrootseconomics/go-vise/engine" + "github.com/grassrootseconomics/go-vise/lang" + "github.com/grassrootseconomics/go-vise/logging" + "github.com/grassrootseconomics/go-vise/resource" ) var ( @@ -112,11 +112,11 @@ func main() { os.Exit(1) } - logdb, err := menuStorageService.GetLogDb(ctx, userdatastore, logDbConnStr, "user-data") - if err != nil { - fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) - os.Exit(1) - } + // logdb, err := menuStorageService.GetLogDb(ctx, userdatastore, logDbConnStr, "user-data") + // if err != nil { + // fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) + // os.Exit(1) + // } dbResource, ok := rs.(*resource.DbResource) if !ok { @@ -126,7 +126,7 @@ func main() { lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs) lhs.SetDataStore(&userdatastore) - lhs.SetLogDb(&logdb) + // lhs.SetLogDb(&logdb) lhs.SetPersister(pe) if err != nil { fmt.Fprintf(os.Stderr, "localhandler service error: %v\n", err) diff --git a/cmd/ssh/main.go b/cmd/ssh/main.go index 96dd150..a11edb7 100644 --- a/cmd/ssh/main.go +++ b/cmd/ssh/main.go @@ -10,9 +10,9 @@ import ( "sync" "syscall" - "git.defalsify.org/vise.git/db" - "git.defalsify.org/vise.git/engine" - "git.defalsify.org/vise.git/logging" + "github.com/grassrootseconomics/go-vise/db" + "github.com/grassrootseconomics/go-vise/engine" + "github.com/grassrootseconomics/go-vise/logging" "git.grassecon.net/grassrootseconomics/sarafu-vise/config" "git.grassecon.net/grassrootseconomics/sarafu-vise/ssh" @@ -38,7 +38,7 @@ func main() { var stateDebug bool var host string var port uint - + flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)") flag.StringVar(&override.ResourceConn, "resource", "?", "resource connection string") flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string") @@ -81,9 +81,9 @@ func main() { pfp := path.Join(scriptDir, "pp.csv") cfg := engine.Config{ - Root: "root", - OutputSize: uint32(size), - FlagCount: uint32(128), + Root: "root", + OutputSize: uint32(size), + FlagCount: uint32(128), ResetOnEmptyInput: true, } if stateDebug { diff --git a/debug/db.go b/debug/db.go index 15e54d1..2f1e0d8 100644 --- a/debug/db.go +++ b/debug/db.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "fmt" - visedb "git.defalsify.org/vise.git/db" storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" + visedb "github.com/grassrootseconomics/go-vise/db" ) var ( diff --git a/debug/db_debug.go b/debug/db_debug.go index f781d9f..98a59d2 100644 --- a/debug/db_debug.go +++ b/debug/db_debug.go @@ -4,7 +4,7 @@ package debug import ( - "git.defalsify.org/vise.git/db" + "github.com/grassrootseconomics/go-vise/db" storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" ) diff --git a/debug/db_test.go b/debug/db_test.go index c7b8930..80e6ca8 100644 --- a/debug/db_test.go +++ b/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 "github.com/grassrootseconomics/go-vise/db" ) func TestDebugDbSubKeyInfo(t *testing.T) { diff --git a/devtools/admin/main.go b/devtools/admin/main.go index c3ce57f..cc16e7c 100644 --- a/devtools/admin/main.go +++ b/devtools/admin/main.go @@ -7,7 +7,7 @@ import ( "os" "path" - "git.defalsify.org/vise.git/logging" + "github.com/grassrootseconomics/go-vise/logging" "git.grassecon.net/grassrootseconomics/sarafu-vise/config" "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application" diff --git a/devtools/lang/main.go b/devtools/lang/main.go index 4dd3090..7ffb5d2 100644 --- a/devtools/lang/main.go +++ b/devtools/lang/main.go @@ -8,9 +8,9 @@ import ( "path" "strings" - "git.defalsify.org/vise.git/lang" - "git.defalsify.org/vise.git/logging" "git.grassecon.net/grassrootseconomics/visedriver/config" + "github.com/grassrootseconomics/go-vise/lang" + "github.com/grassrootseconomics/go-vise/logging" ) const ( diff --git a/devtools/store/dump/main.go b/devtools/store/dump/main.go index 6844a22..9e5b5e2 100644 --- a/devtools/store/dump/main.go +++ b/devtools/store/dump/main.go @@ -7,11 +7,11 @@ import ( "os" "path" - "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" + "github.com/grassrootseconomics/go-vise/db" + "github.com/grassrootseconomics/go-vise/logging" ) var ( diff --git a/go.mod b/go.mod index 3a3380e..c8454bd 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,24 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise -go 1.23.4 +go 1.24 + +toolchain go1.24.2 require ( - git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce + git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f - git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 + git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250507100938-d07f95e1b4ad git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 github.com/alecthomas/assert/v2 v2.2.2 github.com/gofrs/uuid v4.4.0+incompatible + github.com/grassrootseconomics/ethutils v1.3.1 + github.com/grassrootseconomics/go-vise v0.4.1 github.com/grassrootseconomics/ussd-data-service v1.2.0-beta - github.com/jackc/pgx/v5 v5.7.1 + github.com/jackc/pgx/v5 v5.7.4 github.com/peteole/testdata-loader v0.3.0 github.com/stretchr/testify v1.9.0 - golang.org/x/crypto v0.32.0 + golang.org/x/crypto v0.38.0 gopkg.in/leonelquinteros/gotext.v1 v1.3.1 ) @@ -40,7 +44,6 @@ require ( github.com/go-ole/go-ole v1.3.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grassrootseconomics/eth-custodial v1.3.0-beta // indirect - github.com/grassrootseconomics/ethutils v1.3.1 // indirect github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect github.com/hexops/gotextdiff v1.0.3 // indirect github.com/holiman/uint256 v1.3.1 // indirect @@ -59,9 +62,9 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.29.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/sync v0.14.0 // indirect + golang.org/x/sys v0.33.0 // indirect + golang.org/x/text v0.25.0 // indirect golang.org/x/time v0.7.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect rsc.io/tmplfunc v0.0.3 // indirect diff --git a/go.sum b/go.sum index 190901f..8a08d71 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,23 @@ -git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce h1:Uke2jQ4wG97gQKnTzxPyBGyhosrU1IWnRNFHtKVrmrk= -git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck= +git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA= +git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck= git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e h1:DcC9qkNl9ny3hxQmsMK6W81+5R/j4ZwYUbvewMI/rlc= git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60= git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f h1:OAHCP3YR1C5h1WFnnEnLs5kn6jTxQHQYWYtQaMZJIMY= git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8= -git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 h1:Jo+yWysWw/N5BJQtAyEMN8ePVvAyPHv+JG4lQti+1N4= -git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306/go.mod h1:FdLwYtzsjOIcDiW4uDgDYnB4Wdzq12uJUe0QHSSPbSo= +git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2 h1:ON77G5K0JNuwPb5JT/hRfF6G6+xstlBQgEIEzWydnhg= +git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk= +git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250507100938-d07f95e1b4ad h1:u5em3djRpQ+iMruyDtjCKq+yY+g4dMivz4kbl9hVknw= +git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250507100938-d07f95e1b4ad/go.mod h1:QnfvU88T7bSoXFkcXrUgTLpKD/YYiXjYh0rfFoNbGaE= git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E= git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ= +github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= +github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= +github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI= +github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI= 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= @@ -20,10 +26,28 @@ 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/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bits-and-blooms/bitset v1.14.3 h1:Gd2c8lSNf9pKXom5JtD7AaKO8o7fGQ2LtFj1436qilA= github.com/bits-and-blooms/bitset v1.14.3/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I= +github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8= +github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4= +github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/pebble v1.1.2 h1:CUh2IPtR4swHlEj48Rhfzw6l/d0qA31fItcIszQVIsA= +github.com/cockroachdb/pebble v1.1.2/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= +github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= +github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJF7HpyG8M= @@ -37,6 +61,7 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM= github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= +github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= @@ -48,11 +73,25 @@ github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= 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/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps= +github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= +github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= 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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= +github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -60,42 +99,70 @@ github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQ github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo= github.com/grassrootseconomics/ethutils v1.3.1 h1:LlQO90HjJkl7ejC8fv6jP7RJUrAm1j4VMMCYfsoIrhU= github.com/grassrootseconomics/ethutils v1.3.1/go.mod h1:Wuv1VEZrkLIXqTSEYI3Nh9HG/ZHOUQ+U+xvWJ8QtjgQ= +github.com/grassrootseconomics/go-vise v0.4.1 h1:g26jvYnsWaTns60ZHdltGcsL9cjWqvYZwUZ2FWVKOGo= +github.com/grassrootseconomics/go-vise v0.4.1/go.mod h1:tt3/Swp9F9PdhSDBDvwuI1GZRrCg32kWXWzyATIpTO4= github.com/grassrootseconomics/ussd-data-service v1.2.0-beta h1:fn1gwbWIwHVEBtUC2zi5OqTlfI/5gU1SMk0fgGixIXk= github.com/grassrootseconomics/ussd-data-service v1.2.0-beta/go.mod h1:omfI0QtUwIdpu9gMcUqLMCG8O1XWjqJGBx1qUMiGWC0= 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/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= +github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs= github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= 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/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg= +github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ= 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/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= +github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= +github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/lmittmann/w3 v0.17.1 h1:zdXIimmNmYfqOFur+Jqc9Yqwtq6jwnsQufbTOnSAtW4= github.com/lmittmann/w3 v0.17.1/go.mod h1:WVUGMbL83WYBu4Sge3SVlW3qIG4VaHe+S8+UUnwz9Eg= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= 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/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= -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/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= +github.com/pashagolub/pgxmock/v4 v4.7.0 h1:de2ORuFYyjwOQR7NBm57+321RnZxpYiuUjsmqRiqgh8= +github.com/pashagolub/pgxmock/v4 v4.7.0/go.mod h1:9L57pC193h2aKRHVyiiE817avasIPZnPwPlw3JczWvM= 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/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/prometheus/client_golang v1.12.0 h1:C+UIj/QWtmqY13Arb8kwMt5j34/0Z2iKamrJ+ryC0Gg= +github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a h1:CmF68hwI0XsOQ5UwlBopMi2Ow4Pbg32akc4KIVCOm+Y= +github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= 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/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= @@ -109,35 +176,41 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= +github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= 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.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= +golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= +golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= +golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= -golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= +golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= +golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= +golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= 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= diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index ba70bf8..30ffc44 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -12,14 +12,6 @@ import ( "gopkg.in/leonelquinteros/gotext.v1" - "git.defalsify.org/vise.git/asm" - "git.defalsify.org/vise.git/cache" - "git.defalsify.org/vise.git/db" - "git.defalsify.org/vise.git/lang" - "git.defalsify.org/vise.git/logging" - "git.defalsify.org/vise.git/persist" - "git.defalsify.org/vise.git/resource" - "git.defalsify.org/vise.git/state" "git.grassecon.net/grassrootseconomics/common/hex" "git.grassecon.net/grassrootseconomics/common/identity" commonlang "git.grassecon.net/grassrootseconomics/common/lang" @@ -34,6 +26,14 @@ import ( "git.grassecon.net/grassrootseconomics/sarafu-vise/store" storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" "github.com/grassrootseconomics/ethutils" + "github.com/grassrootseconomics/go-vise/asm" + "github.com/grassrootseconomics/go-vise/cache" + "github.com/grassrootseconomics/go-vise/db" + "github.com/grassrootseconomics/go-vise/lang" + "github.com/grassrootseconomics/go-vise/logging" + "github.com/grassrootseconomics/go-vise/persist" + "github.com/grassrootseconomics/go-vise/resource" + "github.com/grassrootseconomics/go-vise/state" dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api" ) diff --git a/handlers/application/menuhandler_test.go b/handlers/application/menuhandler_test.go index d07e0cc..466ac6d 100644 --- a/handlers/application/menuhandler_test.go +++ b/handlers/application/menuhandler_test.go @@ -10,11 +10,6 @@ import ( "testing" "time" - "git.defalsify.org/vise.git/cache" - "git.defalsify.org/vise.git/lang" - "git.defalsify.org/vise.git/persist" - "git.defalsify.org/vise.git/resource" - "git.defalsify.org/vise.git/state" "git.grassecon.net/grassrootseconomics/common/pin" "git.grassecon.net/grassrootseconomics/sarafu-api/models" "git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks" @@ -22,14 +17,19 @@ import ( "git.grassecon.net/grassrootseconomics/sarafu-vise/profile" "git.grassecon.net/grassrootseconomics/sarafu-vise/store" storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" + "github.com/grassrootseconomics/go-vise/cache" + "github.com/grassrootseconomics/go-vise/lang" + "github.com/grassrootseconomics/go-vise/persist" + "github.com/grassrootseconomics/go-vise/resource" + "github.com/grassrootseconomics/go-vise/state" "github.com/alecthomas/assert/v2" testdataloader "github.com/peteole/testdata-loader" "github.com/stretchr/testify/require" - visedb "git.defalsify.org/vise.git/db" - memdb "git.defalsify.org/vise.git/db/mem" + visedb "github.com/grassrootseconomics/go-vise/db" + memdb "github.com/grassrootseconomics/go-vise/db/mem" dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api" ) diff --git a/handlers/event/event.go b/handlers/event/event.go index e654820..1f7bf5e 100644 --- a/handlers/event/event.go +++ b/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.grassecon.net/grassrootseconomics/visedriver/storage" + "github.com/grassrootseconomics/go-vise/logging" + "github.com/grassrootseconomics/go-vise/persist" ) var ( diff --git a/handlers/event/token.go b/handlers/event/token.go index b9edb8b..7c06abe 100644 --- a/handlers/event/token.go +++ b/handlers/event/token.go @@ -5,11 +5,11 @@ import ( "fmt" "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" + "github.com/grassrootseconomics/go-vise/db" ) // execute all diff --git a/handlers/local.go b/handlers/local.go index 69f5883..774252c 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -4,11 +4,11 @@ import ( "context" "strings" - "git.defalsify.org/vise.git/db" - "git.defalsify.org/vise.git/engine" - "git.defalsify.org/vise.git/logging" - "git.defalsify.org/vise.git/persist" - "git.defalsify.org/vise.git/resource" + "github.com/grassrootseconomics/go-vise/db" + "github.com/grassrootseconomics/go-vise/engine" + "github.com/grassrootseconomics/go-vise/logging" + "github.com/grassrootseconomics/go-vise/persist" + "github.com/grassrootseconomics/go-vise/resource" "git.grassecon.net/grassrootseconomics/sarafu-api/remote" "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application" diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go index ac286c1..3817d40 100644 --- a/internal/cmd/cmd.go +++ b/internal/cmd/cmd.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "git.defalsify.org/vise.git/logging" "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application" "git.grassecon.net/grassrootseconomics/visedriver/storage" + "github.com/grassrootseconomics/go-vise/logging" ) var ( diff --git a/internal/sms/sms.go b/internal/sms/sms.go index f6d51ce..b0de809 100644 --- a/internal/sms/sms.go +++ b/internal/sms/sms.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "git.defalsify.org/vise.git/logging" "git.grassecon.net/grassrootseconomics/common/phone" "git.grassecon.net/grassrootseconomics/sarafu-api/remote" "git.grassecon.net/grassrootseconomics/sarafu-vise/store" storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" + "github.com/grassrootseconomics/go-vise/logging" ) var ( diff --git a/menutraversal_test/menu_traversal_test.go b/menutraversal_test/menu_traversal_test.go index 64ea262..e89c83a 100644 --- a/menutraversal_test/menu_traversal_test.go +++ b/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" + "github.com/grassrootseconomics/go-vise/logging" ) var ( diff --git a/ssh/keystore.go b/ssh/keystore.go index 37ebdef..cc35a4c 100644 --- a/ssh/keystore.go +++ b/ssh/keystore.go @@ -11,7 +11,6 @@ import ( "git.defalsify.org/vise.git/db" "git.grassecon.net/grassrootseconomics/visedriver/storage" - dbstorage "git.grassecon.net/grassrootseconomics/visedriver/storage/db/gdbm" ) type SshKeyStore struct { @@ -21,7 +20,7 @@ type SshKeyStore struct { func NewSshKeyStore(ctx context.Context, dbDir string) (*SshKeyStore, error) { keyStore := &SshKeyStore{} keyStoreFile := path.Join(dbDir, "ssh_authorized_keys.gdbm") - keyStore.store = dbstorage.NewThreadGdbmDb() + // keyStore.store = dbstorage.NewThreadGdbmDb() err := keyStore.store.Connect(ctx, keyStoreFile) if err != nil { return nil, err diff --git a/ssh/ssh.go b/ssh/ssh.go index bab538a..7027d2f 100644 --- a/ssh/ssh.go +++ b/ssh/ssh.go @@ -12,13 +12,13 @@ import ( "golang.org/x/crypto/ssh" - "git.defalsify.org/vise.git/engine" - "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" + "github.com/grassrootseconomics/go-vise/engine" + "github.com/grassrootseconomics/go-vise/logging" + "github.com/grassrootseconomics/go-vise/resource" + "github.com/grassrootseconomics/go-vise/state" ) var ( @@ -181,8 +181,8 @@ func (s *SshRunner) GetEngine(sessionId string) (engine.Engine, func(), error) { accountService := services.New(ctx, menuStorageService) _, err = lhs.GetHandler(accountService) if err != nil { - fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err) - os.Exit(1) + fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err) + os.Exit(1) } en := lhs.GetEngine(lhs.Cfg, rs, pe) closer := func() { diff --git a/store/db/db.go b/store/db/db.go index 517d0a0..4872052 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "errors" - "git.defalsify.org/vise.git/logging" + "github.com/grassrootseconomics/go-vise/logging" ) // DataType is a subprefix value used in association with vise/db.DATATYPE_USERDATA. @@ -65,7 +65,7 @@ const ( DATA_ACCOUNT_ALIAS //currently suggested alias by the api awaiting user's confirmation as accepted account alias DATA_SUGGESTED_ALIAS - //Key used to store a value of 1 for a user to reset their own PIN once they access the menu. + //Key used to store a value of 1 for a user to reset their own PIN once they access the menu. DATA_SELF_PIN_RESET ) diff --git a/store/db/sub_prefix_db.go b/store/db/sub_prefix_db.go index 156fbc2..350c6ac 100644 --- a/store/db/sub_prefix_db.go +++ b/store/db/sub_prefix_db.go @@ -3,7 +3,7 @@ package db import ( "context" - "git.defalsify.org/vise.git/db" + "github.com/grassrootseconomics/go-vise/db" ) // PrefixDb interface abstracts the database operations. diff --git a/store/db/sub_prefix_db_test.go b/store/db/sub_prefix_db_test.go index d5d25fd..bd85b1c 100644 --- a/store/db/sub_prefix_db_test.go +++ b/store/db/sub_prefix_db_test.go @@ -5,7 +5,7 @@ import ( "context" "testing" - memdb "git.defalsify.org/vise.git/db/mem" + memdb "github.com/grassrootseconomics/go-vise/db/mem" ) func TestSubPrefix(t *testing.T) { diff --git a/store/log_db.go b/store/log_db.go index d056a2e..cf5d50d 100644 --- a/store/log_db.go +++ b/store/log_db.go @@ -3,9 +3,9 @@ package store import ( "context" - visedb "git.defalsify.org/vise.git/db" "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" + visedb "github.com/grassrootseconomics/go-vise/db" ) type LogDb struct { diff --git a/store/user_store.go b/store/user_store.go index eea6d7e..e5613a5 100644 --- a/store/user_store.go +++ b/store/user_store.go @@ -3,11 +3,11 @@ package store import ( "context" - visedb "git.defalsify.org/vise.git/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" + visedb "github.com/grassrootseconomics/go-vise/db" ) // TODO: Rename interface, "datastore" is redundant naming and too general diff --git a/store/vouchers.go b/store/vouchers.go index 94ebc5a..cd55359 100644 --- a/store/vouchers.go +++ b/store/vouchers.go @@ -6,8 +6,8 @@ import ( "math/big" "strings" - "git.defalsify.org/vise.git/logging" storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" + "github.com/grassrootseconomics/go-vise/logging" dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api" ) diff --git a/store/vouchers_test.go b/store/vouchers_test.go index 711f93b..f4020d5 100644 --- a/store/vouchers_test.go +++ b/store/vouchers_test.go @@ -8,8 +8,8 @@ import ( "github.com/alecthomas/assert/v2" "github.com/stretchr/testify/require" - memdb "git.defalsify.org/vise.git/db/mem" storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db" + memdb "github.com/grassrootseconomics/go-vise/db/mem" dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api" ) diff --git a/testutil/engine.go b/testutil/engine.go index 531481d..9ff61fa 100644 --- a/testutil/engine.go +++ b/testutil/engine.go @@ -9,10 +9,6 @@ import ( "path/filepath" "time" - "git.defalsify.org/vise.git/asm" - "git.defalsify.org/vise.git/engine" - "git.defalsify.org/vise.git/persist" - "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" @@ -20,6 +16,10 @@ import ( "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers" "git.grassecon.net/grassrootseconomics/sarafu-vise/testutil/testtag" "git.grassecon.net/grassrootseconomics/visedriver/storage" + "github.com/grassrootseconomics/go-vise/asm" + "github.com/grassrootseconomics/go-vise/engine" + "github.com/grassrootseconomics/go-vise/persist" + "github.com/grassrootseconomics/go-vise/resource" "github.com/jackc/pgx/v5/pgxpool" ) @@ -113,11 +113,11 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe os.Exit(1) } - logdb, err := menuStorageService.GetLogDb(ctx, userDataStore, "test-db-logs", "user-data") - if err != nil { - fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) - os.Exit(1) - } + // logdb, err := menuStorageService.GetLogDb(ctx, userDataStore, "test-db-logs", "user-data") + // if err != nil { + // fmt.Fprintf(os.Stderr, "get log db error: %v\n", err) + // os.Exit(1) + // } dbResource, ok := rs.(*resource.DbResource) if !ok { @@ -127,7 +127,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs) lhs.SetDataStore(&userDataStore) - lhs.SetLogDb(&logdb) + // lhs.SetLogDb(&logdb) lhs.SetPersister(pe) if err != nil { fmt.Fprintf(os.Stderr, err.Error()) @@ -161,7 +161,7 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool, *persist.Pe en := lhs.GetEngine(lhs.Cfg, rs, pe) cleanFn := func() { - logdb.Close(ctx) + // logdb.Close(ctx) err := en.Finish(ctx) if err != nil { logg.Errorf(err.Error()) diff --git a/testutil/setup.go b/testutil/setup.go index 58273b7..bfc346c 100644 --- a/testutil/setup.go +++ b/testutil/setup.go @@ -4,11 +4,11 @@ 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" + "github.com/grassrootseconomics/go-vise/db" + fsdb "github.com/grassrootseconomics/go-vise/db/fs" + "github.com/grassrootseconomics/go-vise/logging" testdataloader "github.com/peteole/testdata-loader" )