Compare commits

..

29 Commits

Author SHA1 Message Date
26f6e9ea12
Updated the alias and balance functionality to match master 2025-07-14 09:45:55 +03:00
b43c1f6c8e
Merge branch 'master' into project-tidyup 2025-07-14 09:38:04 +03:00
754008f0c1
git ignore the user-data files 2025-07-04 13:56:46 +03:00
c8a705ff44
move voucher related tests 2025-07-03 17:57:24 +03:00
a55d254c4f
move transaction list related tests 2025-07-03 17:52:30 +03:00
92af428af4
move send node related tests 2025-07-03 17:44:55 +03:00
5e166fd680
move registration tests 2025-07-03 17:33:11 +03:00
5d38359b66
move profile tests 2025-07-03 17:31:05 +03:00
7c21b78332
move language tests 2025-07-03 17:22:06 +03:00
916026985f
move balance tests 2025-07-03 17:16:44 +03:00
57b0fcb55f
move authorization tests 2025-07-03 17:13:51 +03:00
baa7526df3
move account_status tests 2025-07-03 17:07:26 +03:00
f22f86a2fb
move PIN tests to pin_test.go 2025-07-03 17:02:36 +03:00
827debe020
added account_status.go for account status related functions 2025-07-03 16:55:57 +03:00
2b557b27cf
added authorization.go for authorization related functions 2025-07-03 16:52:59 +03:00
b9aae610db
added language.go for language related functions 2025-07-03 16:43:43 +03:00
8297f012f4
added balance.go for balance related functions 2025-07-03 16:39:44 +03:00
eafc0f69c7
added alias.go for alias related functions 2025-07-03 16:34:20 +03:00
6c962baa81
added pools.go for pool related functions 2025-07-03 16:20:59 +03:00
e6b97b9256
update the voucher functions to match master 2025-07-03 16:19:18 +03:00
4e8b4c1df6 Merge branch 'master' into project-tidyup 2025-07-03 16:08:08 +03:00
fea0befd9f
added profile.go for profile related functionality 2025-07-01 02:04:45 +03:00
857964f69a
added send.go for voucher transfers 2025-07-01 02:01:45 +03:00
164ce5ea5a
added upsell.go for inviting valid users 2025-07-01 01:59:20 +03:00
7b85451fd6
added vouchers.go 2025-07-01 01:57:32 +03:00
a6cd3d93b4
added transactions.go for transaction histories 2025-07-01 01:55:30 +03:00
9722df1149
added poolswap.go for pool swap functionality 2025-07-01 01:53:03 +03:00
a9e0aebdde
move PIN functionality to pin.go 2025-07-01 01:50:20 +03:00
098ea93439
move create account functionality to the registration.go file 2025-07-01 01:44:38 +03:00
9 changed files with 22 additions and 136 deletions

View File

@ -83,7 +83,6 @@ func (h *MenuHandlers) CheckAccountCreated(ctx context.Context, sym string, inpu
// CheckBlockedStatus:
// 1. Checks whether the DATA_SELF_PIN_RESET is 1 and sets the flag_account_pin_reset
// 2. resets the account blocked flag if the PIN attempts have been reset by an admin.
// 3. Sets key flags (language and PIN) if the data exists
func (h *MenuHandlers) CheckBlockedStatus(ctx context.Context, sym string, input []byte) (resource.Result, error) {
var res resource.Result
store := h.userdataStore
@ -91,30 +90,11 @@ func (h *MenuHandlers) CheckBlockedStatus(ctx context.Context, sym string, input
flag_account_blocked, _ := h.flagManager.GetFlag("flag_account_blocked")
flag_account_pin_reset, _ := h.flagManager.GetFlag("flag_account_pin_reset")
flag_pin_set, _ := h.flagManager.GetFlag("flag_pin_set")
flag_language_set, _ := h.flagManager.GetFlag("flag_language_set")
pinFlagSet := h.st.MatchFlag(flag_pin_set, true)
languageFlagSet := h.st.MatchFlag(flag_language_set, true)
sessionId, ok := ctx.Value("SessionId").(string)
if !ok {
return res, fmt.Errorf("missing session")
}
// only check the data if the flag isn't set
if !pinFlagSet {
accountPin, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_PIN)
if len(accountPin) > 0 {
res.FlagSet = append(res.FlagSet, flag_pin_set)
}
}
if !languageFlagSet {
languageCode, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_SELECTED_LANGUAGE_CODE)
if len(languageCode) > 0 {
res.FlagSet = append(res.FlagSet, flag_language_set)
}
}
res.FlagReset = append(res.FlagReset, flag_account_pin_reset)
selfPinReset, err := store.ReadEntry(ctx, sessionId, storedb.DATA_SELF_PIN_RESET)

View File

@ -5,7 +5,6 @@ import (
"testing"
"git.defalsify.org/vise.git/resource"
"git.defalsify.org/vise.git/state"
"git.grassecon.net/grassrootseconomics/sarafu-api/models"
"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
@ -94,24 +93,16 @@ func TestCheckBlockedStatus(t *testing.T) {
}
flag_account_blocked, _ := fm.GetFlag("flag_account_blocked")
flag_account_pin_reset, _ := fm.GetFlag("flag_account_pin_reset")
flag_pin_set, _ := fm.GetFlag("flag_pin_set")
flag_language_set, _ := fm.GetFlag("flag_language_set")
// Set the flag in the State
mockState := state.NewState(128)
h := &MenuHandlers{
userdataStore: store,
flagManager: fm,
st: mockState,
}
tests := []struct {
name string
currentWrongPinAttempts string
expectedResult resource.Result
languageSet bool
PinSet bool
}{
{
name: "Currently blocked account",
@ -127,16 +118,6 @@ func TestCheckBlockedStatus(t *testing.T) {
FlagReset: []uint32{flag_account_pin_reset, flag_account_blocked},
},
},
{
name: "Valid account with reset language and PIN flags",
currentWrongPinAttempts: "0",
languageSet: true,
PinSet: true,
expectedResult: resource.Result{
FlagReset: []uint32{flag_account_pin_reset, flag_account_blocked},
FlagSet: []uint32{flag_pin_set, flag_language_set},
},
},
}
for _, tt := range tests {
@ -145,18 +126,6 @@ func TestCheckBlockedStatus(t *testing.T) {
t.Fatal(err)
}
if tt.languageSet {
if err := store.WriteEntry(ctx, sessionId, storedb.DATA_SELECTED_LANGUAGE_CODE, []byte("eng")); err != nil {
t.Fatal(err)
}
}
if tt.PinSet {
if err := store.WriteEntry(ctx, sessionId, storedb.DATA_ACCOUNT_PIN, []byte("hasedPinValue")); err != nil {
t.Fatal(err)
}
}
res, err := h.CheckBlockedStatus(ctx, "", []byte(""))
assert.NoError(t, err)

View File

@ -9,7 +9,6 @@ import (
"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
"gopkg.in/leonelquinteros/gotext.v1"
)
@ -37,26 +36,9 @@ func (h *MenuHandlers) GetPools(ctx context.Context, sym string, input []byte) (
return res, nil
}
activePoolSymStr := ""
data := store.ProcessPools(topPools)
activePoolSym, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_POOL_SYM)
if err != nil {
activePoolSymStr = config.DefaultPoolSymbol()
} else {
activePoolSymStr = string(activePoolSym)
}
// Filter out the active pool from topPools
filteredPools := make([]dataserviceapi.PoolDetails, 0, len(topPools))
for _, p := range topPools {
if p.PoolSymbol != activePoolSymStr {
filteredPools = append(filteredPools, p)
}
}
data := store.ProcessPools(filteredPools)
// Store the filtered Pool data
// Store all Pool data
dataMap := map[storedb.DataTyp]string{
storedb.DATA_POOL_NAMES: data.PoolNames,
storedb.DATA_POOL_SYMBOLS: data.PoolSymbols,
@ -118,10 +100,6 @@ func (h *MenuHandlers) ViewPool(ctx context.Context, sym string, input []byte) (
flag_incorrect_pool, _ := h.flagManager.GetFlag("flag_incorrect_pool")
inputStr := string(input)
if inputStr == "0" || inputStr == "99" || inputStr == "88" || inputStr == "98" {
res.FlagReset = append(res.FlagReset, flag_incorrect_pool)
return res, nil
}
poolData, err := store.GetPoolData(ctx, h.userdataStore, sessionId, inputStr)
if err != nil {

View File

@ -10,7 +10,6 @@ import (
"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
"gopkg.in/leonelquinteros/gotext.v1"
)
@ -122,16 +121,7 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
return res, nil
}
// Filter out the active voucher from swapToList
filteredSwapToList := make([]dataserviceapi.TokenHoldings, 0, len(swapToList))
for _, s := range swapToList {
if s.TokenSymbol != string(activeSym) {
filteredSwapToList = append(filteredSwapToList, s)
}
}
// Store filtered swap to list data (excluding the current active voucher)
data := store.ProcessVouchers(filteredSwapToList)
data := store.ProcessVouchers(swapToList)
logg.InfoCtxf(ctx, "ProcessVouchers", "data", data)
@ -171,7 +161,7 @@ func (h *MenuHandlers) SwapMaxLimit(ctx context.Context, sym string, input []byt
res.FlagReset = append(res.FlagReset, flag_incorrect_voucher, flag_low_swap_amount)
inputStr := string(input)
if inputStr == "0" || inputStr == "99" || inputStr == "88" || inputStr == "98" {
if inputStr == "0" {
return res, nil
}

View File

@ -51,9 +51,6 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
res.FlagReset = append(res.FlagReset, flag_no_active_voucher)
// add a variable to filter out the active voucher
activeSymStr := ""
// Check if user has an active voucher with proper error handling
activeSym, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
if err != nil {
@ -65,8 +62,6 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
defaultDec := firstVoucher.TokenDecimals
defaultAddr := firstVoucher.TokenAddress
activeSymStr = defaultSym
// Scale down the balance
scaledBalance := store.ScaleDownBalance(defaultBal, defaultDec)
@ -94,8 +89,10 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
return res, err
}
} else {
// Update active voucher balance
activeSymStr := string(activeSym)
// Find the matching voucher data
activeSymStr = string(activeSym)
var activeData *dataserviceapi.TokenHoldings
for _, voucher := range vouchersResp {
if voucher.TokenSymbol == activeSymStr {
@ -105,10 +102,9 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
}
if activeData == nil {
logg.InfoCtxf(ctx, "activeSym not found in vouchers, setting the first voucher as the default", "activeSym", activeSymStr)
logg.ErrorCtxf(ctx, "activeSym not found in vouchers, setting the first voucher as the default", "activeSym", activeSymStr)
firstVoucher := vouchersResp[0]
activeData = &firstVoucher
activeSymStr = string(activeData.TokenSymbol)
}
// Scale down the balance
@ -124,17 +120,8 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
}
}
// Filter out the active voucher from vouchersResp
filteredVouchers := make([]dataserviceapi.TokenHoldings, 0, len(vouchersResp))
for _, v := range vouchersResp {
if v.TokenSymbol != activeSymStr {
filteredVouchers = append(filteredVouchers, v)
}
}
// Store all voucher data (excluding the current active voucher)
data := store.ProcessVouchers(filteredVouchers)
// Store all voucher data
data := store.ProcessVouchers(vouchersResp)
dataMap := map[storedb.DataTyp]string{
storedb.DATA_VOUCHER_SYMBOLS: data.Symbols,
storedb.DATA_VOUCHER_BALANCES: data.Balances,
@ -153,7 +140,7 @@ func (h *MenuHandlers) ManageVouchers(ctx context.Context, sym string, input []b
return res, nil
}
// GetVoucherList fetches the list of vouchers from the store and formats them.
// GetVoucherList fetches the list of vouchers and formats them.
func (h *MenuHandlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
var res resource.Result
sessionId, ok := ctx.Value("SessionId").(string)
@ -204,10 +191,6 @@ func (h *MenuHandlers) ViewVoucher(ctx context.Context, sym string, input []byte
flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
inputStr := string(input)
if inputStr == "0" || inputStr == "99" || inputStr == "88" || inputStr == "98" {
res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
return res, nil
}
metadata, err := store.GetVoucherData(ctx, h.userdataStore, sessionId, inputStr)
if err != nil {
@ -224,16 +207,8 @@ func (h *MenuHandlers) ViewVoucher(ctx context.Context, sym string, input []byte
return res, err
}
// Format the balance to 2 decimal places
formattedAmount, err := store.TruncateDecimalString(metadata.Balance, 2)
if err != nil {
logg.ErrorCtxf(ctx, "failed to TruncateDecimalString on ViewVoucher", "error", err)
res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
return res, nil
}
res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
res.Content = l.Get("Symbol: %s\nBalance: %s", metadata.TokenSymbol, formattedAmount)
res.Content = l.Get("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance)
return res, nil
}

View File

@ -73,8 +73,8 @@ func TestManageVouchers(t *testing.T) {
Balance: "100",
},
},
expectedVoucherSymbols: []byte(""),
expectedUpdatedAddress: []byte(""),
expectedVoucherSymbols: []byte("1:TOKEN1"),
expectedUpdatedAddress: []byte("0x123"),
expectedResult: resource.Result{
FlagReset: []uint32{flag_api_error, flag_no_active_voucher},
},
@ -86,7 +86,7 @@ func TestManageVouchers(t *testing.T) {
{TokenAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200"},
},
storedActiveVoucher: "SRF",
expectedVoucherSymbols: []byte("1:MILO"),
expectedVoucherSymbols: []byte("1:SRF\n2:MILO"),
expectedUpdatedAddress: []byte("0xd4c288865Ce"),
expectedResult: resource.Result{
FlagReset: []uint32{flag_api_error, flag_no_active_voucher},

View File

@ -9,16 +9,14 @@ MAP check_balance
MOUT send 1
MOUT swap 2
MOUT vouchers 3
MOUT select_pool 4
MOUT account 5
MOUT help 6
MOUT account 4
MOUT help 5
MOUT quit 9
HALT
INCMP send 1
INCMP swap_to_list 2
INCMP my_vouchers 3
INCMP select_pool 4
INCMP my_account 5
INCMP help 6
INCMP my_account 4
INCMP help 5
INCMP quit 9
INCMP . *

View File

@ -2,9 +2,11 @@ LOAD reset_account_authorized 16
RELOAD reset_account_authorized
MOUT select_voucher 1
MOUT voucher_details 2
MOUT select_pool 3
MOUT back 0
HALT
INCMP _ 0
INCMP select_voucher 1
INCMP voucher_details 2
INCMP select_pool 3
INCMP . *

View File

@ -4,17 +4,11 @@ RELOAD swap_to_list
MAP swap_to_list
CATCH missing_voucher flag_incorrect_voucher 1
MOUT back 0
MOUT quit 99
MNEXT next 88
MPREV prev 98
HALT
INCMP > 88
INCMP < 98
INCMP _ 0
INCMP quit 99
LOAD swap_max_limit 64
RELOAD swap_max_limit
CATCH api_failure flag_api_call_error 1
CATCH . flag_incorrect_voucher 1
CATCH low_swap_amount flag_low_swap_amount 1
INCMP _ 0
INCMP swap_limit *