Compare commits
No commits in common. "master" and "lash/no-persister-deadlock" have entirely different histories.
master
...
lash/no-pe
21
common/db.go
21
common/db.go
@ -32,19 +32,7 @@ const (
|
||||
DATA_PUBLIC_KEY_REVERSE
|
||||
DATA_ACTIVE_DECIMAL
|
||||
DATA_ACTIVE_ADDRESS
|
||||
// Start the sub prefix data at 256 (0x0100)
|
||||
DATA_VOUCHER_SYMBOLS DataTyp = 256 + iota
|
||||
DATA_VOUCHER_BALANCES
|
||||
DATA_VOUCHER_DECIMALS
|
||||
DATA_VOUCHER_ADDRESSES
|
||||
DATA_TX_SENDERS
|
||||
DATA_TX_RECIPIENTS
|
||||
DATA_TX_VALUES
|
||||
DATA_TX_ADDRESSES
|
||||
DATA_TX_HASHES
|
||||
DATA_TX_DATES
|
||||
DATA_TX_SYMBOLS
|
||||
DATA_TX_DECIMALS
|
||||
DATA_TRANSACTIONS
|
||||
)
|
||||
|
||||
var (
|
||||
@ -81,10 +69,3 @@ func StringToDataTyp(str string) (DataTyp, error) {
|
||||
return 0, errors.New("invalid DataTyp string")
|
||||
}
|
||||
}
|
||||
|
||||
// ToBytes converts DataTyp or int to a byte slice
|
||||
func ToBytes[T ~uint16 | int](value T) []byte {
|
||||
bytes := make([]byte, 2)
|
||||
binary.BigEndian.PutUint16(bytes, uint16(value))
|
||||
return bytes
|
||||
}
|
||||
|
@ -57,25 +57,25 @@ func ProcessTransfers(transfers []dataserviceapi.Last10TxResponse) TransferMetad
|
||||
// GetTransferData retrieves and matches transfer data
|
||||
// returns a formatted string of the full transaction/statement
|
||||
func GetTransferData(ctx context.Context, db storage.PrefixDb, publicKey string, index int) (string, error) {
|
||||
keys := []DataTyp{DATA_TX_SENDERS, DATA_TX_RECIPIENTS, DATA_TX_VALUES, DATA_TX_ADDRESSES, DATA_TX_HASHES, DATA_TX_DATES, DATA_TX_SYMBOLS}
|
||||
data := make(map[DataTyp]string)
|
||||
keys := []string{"txfrom", "txto", "txval", "txaddr", "txhash", "txdate", "txsym"}
|
||||
data := make(map[string]string)
|
||||
|
||||
for _, key := range keys {
|
||||
value, err := db.Get(ctx, ToBytes(key))
|
||||
value, err := db.Get(ctx, []byte(key))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("failed to get %s: %v", ToBytes(key), err)
|
||||
return "", fmt.Errorf("failed to get %s: %v", key, err)
|
||||
}
|
||||
data[key] = string(value)
|
||||
}
|
||||
|
||||
// Split the data
|
||||
senders := strings.Split(string(data[DATA_TX_SENDERS]), "\n")
|
||||
recipients := strings.Split(string(data[DATA_TX_RECIPIENTS]), "\n")
|
||||
values := strings.Split(string(data[DATA_TX_VALUES]), "\n")
|
||||
addresses := strings.Split(string(data[DATA_TX_ADDRESSES]), "\n")
|
||||
hashes := strings.Split(string(data[DATA_TX_HASHES]), "\n")
|
||||
dates := strings.Split(string(data[DATA_TX_DATES]), "\n")
|
||||
syms := strings.Split(string(data[DATA_TX_SYMBOLS]), "\n")
|
||||
senders := strings.Split(string(data["txfrom"]), "\n")
|
||||
recipients := strings.Split(string(data["txto"]), "\n")
|
||||
values := strings.Split(string(data["txval"]), "\n")
|
||||
addresses := strings.Split(string(data["txaddr"]), "\n")
|
||||
hashes := strings.Split(string(data["txhash"]), "\n")
|
||||
dates := strings.Split(string(data["txdate"]), "\n")
|
||||
syms := strings.Split(string(data["txsym"]), "\n")
|
||||
|
||||
// Check if index is within range
|
||||
if index < 1 || index > len(senders) {
|
||||
|
@ -64,23 +64,22 @@ func ScaleDownBalance(balance, decimals string) string {
|
||||
|
||||
// GetVoucherData retrieves and matches voucher data
|
||||
func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
|
||||
keys := []DataTyp{DATA_VOUCHER_SYMBOLS, DATA_VOUCHER_BALANCES, DATA_VOUCHER_DECIMALS, DATA_VOUCHER_ADDRESSES}
|
||||
data := make(map[DataTyp]string)
|
||||
keys := []string{"sym", "bal", "deci", "addr"}
|
||||
data := make(map[string]string)
|
||||
|
||||
for _, key := range keys {
|
||||
value, err := db.Get(ctx, ToBytes(key))
|
||||
value, err := db.Get(ctx, []byte(key))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get %s: %v", ToBytes(key), err)
|
||||
return nil, fmt.Errorf("failed to get %s: %v", key, err)
|
||||
}
|
||||
data[key] = string(value)
|
||||
}
|
||||
|
||||
symbol, balance, decimal, address := MatchVoucher(input,
|
||||
data[DATA_VOUCHER_SYMBOLS],
|
||||
data[DATA_VOUCHER_BALANCES],
|
||||
data[DATA_VOUCHER_DECIMALS],
|
||||
data[DATA_VOUCHER_ADDRESSES],
|
||||
)
|
||||
data["sym"],
|
||||
data["bal"],
|
||||
data["deci"],
|
||||
data["addr"])
|
||||
|
||||
if symbol == "" {
|
||||
return nil, nil
|
||||
@ -152,7 +151,7 @@ func GetTemporaryVoucherData(ctx context.Context, store DataStore, sessionId str
|
||||
return data, nil
|
||||
}
|
||||
|
||||
// UpdateVoucherData updates the active voucher data in the DataStore.
|
||||
// UpdateVoucherData sets the active voucher data in the DataStore.
|
||||
func UpdateVoucherData(ctx context.Context, store DataStore, sessionId string, data *dataserviceapi.TokenHoldings) error {
|
||||
logg.TraceCtxf(ctx, "dtal", "data", data)
|
||||
// Active voucher data entries
|
||||
|
@ -8,9 +8,8 @@ import (
|
||||
"github.com/alecthomas/assert/v2"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
visedb "git.defalsify.org/vise.git/db"
|
||||
memdb "git.defalsify.org/vise.git/db/mem"
|
||||
"git.grassecon.net/urdt/ussd/internal/storage"
|
||||
memdb "git.defalsify.org/vise.git/db/mem"
|
||||
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
||||
)
|
||||
|
||||
@ -84,21 +83,19 @@ func TestGetVoucherData(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
prefix := ToBytes(visedb.DATATYPE_USERDATA)
|
||||
spdb := storage.NewSubPrefixDb(db, prefix)
|
||||
spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
|
||||
|
||||
// Test voucher data
|
||||
mockData := map[DataTyp][]byte{
|
||||
DATA_VOUCHER_SYMBOLS: []byte("1:SRF\n2:MILO"),
|
||||
DATA_VOUCHER_BALANCES: []byte("1:100\n2:200"),
|
||||
DATA_VOUCHER_DECIMALS: []byte("1:6\n2:4"),
|
||||
DATA_VOUCHER_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
|
||||
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(ToBytes(key)), []byte(value))
|
||||
err = spdb.Put(ctx, []byte(key), []byte(value))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
@ -55,9 +55,6 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
|
||||
}
|
||||
|
||||
f.hn = f.hn.WithPersister(rqs.Storage.Persister)
|
||||
defer func() {
|
||||
f.hn.Exit()
|
||||
}()
|
||||
eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
|
||||
en, ok := eni.(*engine.DefaultEngine)
|
||||
if !ok {
|
||||
|
@ -10,6 +10,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"git.defalsify.org/vise.git/asm"
|
||||
"github.com/grassrootseconomics/eth-custodial/pkg/api"
|
||||
|
||||
"git.defalsify.org/vise.git/cache"
|
||||
"git.defalsify.org/vise.git/db"
|
||||
@ -24,13 +25,14 @@ import (
|
||||
"gopkg.in/leonelquinteros/gotext.v1"
|
||||
|
||||
"git.grassecon.net/urdt/ussd/internal/storage"
|
||||
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
||||
)
|
||||
|
||||
var (
|
||||
logg = logging.NewVanilla().WithDomain("ussdmenuhandler")
|
||||
scriptDir = path.Join("services", "registration")
|
||||
translationDir = path.Join(scriptDir, "locale")
|
||||
okResponse *api.OKResponse
|
||||
errResponse *api.ErrResponse
|
||||
)
|
||||
|
||||
// Define the regex patterns as constants
|
||||
@ -85,10 +87,8 @@ func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *util
|
||||
userDb := &common.UserDataStore{
|
||||
Db: userdataStore,
|
||||
}
|
||||
|
||||
// Instantiate the SubPrefixDb with "DATATYPE_USERDATA" prefix
|
||||
prefix := common.ToBytes(db.DATATYPE_USERDATA)
|
||||
prefixDb := storage.NewSubPrefixDb(userdataStore, prefix)
|
||||
// Instantiate the SubPrefixDb with "vouchers" prefix
|
||||
prefixDb := storage.NewSubPrefixDb(userdataStore, []byte("vouchers"))
|
||||
|
||||
h := &Handlers{
|
||||
userdataStore: userDb,
|
||||
@ -115,7 +115,7 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
|
||||
return r, nil
|
||||
}
|
||||
defer func() {
|
||||
h.Exit()
|
||||
h.pe = nil
|
||||
}()
|
||||
|
||||
h.st = h.pe.GetState()
|
||||
@ -142,10 +142,6 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
|
||||
return r, nil
|
||||
}
|
||||
|
||||
func (h *Handlers) Exit() {
|
||||
h.pe = nil
|
||||
}
|
||||
|
||||
// SetLanguage sets the language across the menu
|
||||
func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||
var res resource.Result
|
||||
@ -154,8 +150,7 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r
|
||||
code := strings.Split(symbol, "_")[1]
|
||||
|
||||
if !utils.IsValidISO639(code) {
|
||||
//Fallback to english instead?
|
||||
code = "eng"
|
||||
return res, nil
|
||||
}
|
||||
res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
|
||||
res.Content = code
|
||||
@ -764,11 +759,12 @@ func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (res
|
||||
return res, nil
|
||||
}
|
||||
|
||||
if utils.IsValidYOb(date) {
|
||||
if len(date) == 4 {
|
||||
res.FlagReset = append(res.FlagReset, flag_incorrect_date_format)
|
||||
} else {
|
||||
res.FlagSet = append(res.FlagSet, flag_incorrect_date_format)
|
||||
}
|
||||
|
||||
return res, nil
|
||||
}
|
||||
|
||||
@ -817,17 +813,7 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
|
||||
return res, err
|
||||
}
|
||||
|
||||
// Convert activeBal from []byte to float64
|
||||
balFloat, err := strconv.ParseFloat(string(activeBal), 64)
|
||||
if err != nil {
|
||||
logg.ErrorCtxf(ctx, "failed to parse activeBal as float", "value", string(activeBal), "error", err)
|
||||
return res, err
|
||||
}
|
||||
|
||||
// Format to 2 decimal places
|
||||
balStr := fmt.Sprintf("%.2f %s", balFloat, activeSym)
|
||||
|
||||
res.Content = l.Get("Balance: %s\n", balStr)
|
||||
res.Content = l.Get("Balance: %s\n", fmt.Sprintf("%s %s", activeBal, activeSym))
|
||||
|
||||
return res, nil
|
||||
}
|
||||
@ -1404,7 +1390,14 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)
|
||||
offerings := getEntryOrDefault(store.ReadEntry(ctx, sessionId, common.DATA_OFFERINGS))
|
||||
|
||||
// Construct the full name
|
||||
name := utils.ConstructName(firstName, familyName, defaultValue)
|
||||
name := defaultValue
|
||||
if familyName != defaultValue {
|
||||
if firstName == defaultValue {
|
||||
name = familyName
|
||||
} else {
|
||||
name = firstName + " " + familyName
|
||||
}
|
||||
}
|
||||
|
||||
// Calculate age from year of birth
|
||||
age := defaultValue
|
||||
@ -1543,50 +1536,18 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)
|
||||
return res, nil
|
||||
}
|
||||
|
||||
// check the current active sym and update the data
|
||||
activeSym, _ := store.ReadEntry(ctx, sessionId, common.DATA_ACTIVE_SYM)
|
||||
if activeSym != nil {
|
||||
activeSymStr := string(activeSym)
|
||||
|
||||
// Find the matching voucher data
|
||||
var activeData *dataserviceapi.TokenHoldings
|
||||
for _, voucher := range vouchersResp {
|
||||
if voucher.TokenSymbol == activeSymStr {
|
||||
activeData = &voucher
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if activeData == nil {
|
||||
logg.ErrorCtxf(ctx, "activeSym not found in vouchers", "activeSym", activeSymStr)
|
||||
return res, fmt.Errorf("activeSym %s not found in vouchers", activeSymStr)
|
||||
}
|
||||
|
||||
// Scale down the balance
|
||||
scaledBalance := common.ScaleDownBalance(activeData.Balance, activeData.TokenDecimals)
|
||||
|
||||
// Update the balance field with the scaled value
|
||||
activeData.Balance = scaledBalance
|
||||
|
||||
// Pass the matching voucher data to UpdateVoucherData
|
||||
if err := common.UpdateVoucherData(ctx, h.userdataStore, sessionId, activeData); err != nil {
|
||||
logg.ErrorCtxf(ctx, "failed on UpdateVoucherData", "error", err)
|
||||
return res, err
|
||||
}
|
||||
}
|
||||
|
||||
data := common.ProcessVouchers(vouchersResp)
|
||||
|
||||
// Store all voucher data
|
||||
dataMap := map[common.DataTyp]string{
|
||||
common.DATA_VOUCHER_SYMBOLS: data.Symbols,
|
||||
common.DATA_VOUCHER_BALANCES: data.Balances,
|
||||
common.DATA_VOUCHER_DECIMALS: data.Decimals,
|
||||
common.DATA_VOUCHER_ADDRESSES: data.Addresses,
|
||||
dataMap := map[string]string{
|
||||
"sym": data.Symbols,
|
||||
"bal": data.Balances,
|
||||
"deci": data.Decimals,
|
||||
"addr": data.Addresses,
|
||||
}
|
||||
|
||||
for key, value := range dataMap {
|
||||
if err := h.prefixDb.Put(ctx, []byte(common.ToBytes(key)), []byte(value)); err != nil {
|
||||
if err := h.prefixDb.Put(ctx, []byte(key), []byte(value)); err != nil {
|
||||
return res, nil
|
||||
}
|
||||
}
|
||||
@ -1599,7 +1560,7 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
|
||||
var res resource.Result
|
||||
|
||||
// Read vouchers from the store
|
||||
voucherData, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS))
|
||||
voucherData, err := h.prefixDb.Get(ctx, []byte("sym"))
|
||||
if err != nil {
|
||||
logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err)
|
||||
return res, err
|
||||
@ -1619,10 +1580,6 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r
|
||||
return res, fmt.Errorf("missing session")
|
||||
}
|
||||
|
||||
code := codeFromCtx(ctx)
|
||||
l := gotext.NewLocale(translationDir, code)
|
||||
l.AddDomain("default")
|
||||
|
||||
flag_incorrect_voucher, _ := h.flagManager.GetFlag("flag_incorrect_voucher")
|
||||
|
||||
inputStr := string(input)
|
||||
@ -1647,7 +1604,7 @@ func (h *Handlers) ViewVoucher(ctx context.Context, sym string, input []byte) (r
|
||||
}
|
||||
|
||||
res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
|
||||
res.Content = l.Get("Symbol: %s\nBalance: %s", metadata.TokenSymbol, metadata.Balance)
|
||||
res.Content = fmt.Sprintf("%s\n%s", metadata.TokenSymbol, metadata.Balance)
|
||||
|
||||
return res, nil
|
||||
}
|
||||
@ -1745,19 +1702,19 @@ func (h *Handlers) CheckTransactions(ctx context.Context, sym string, input []by
|
||||
data := common.ProcessTransfers(transactionsResp)
|
||||
|
||||
// Store all transaction data
|
||||
dataMap := map[common.DataTyp]string{
|
||||
common.DATA_TX_SENDERS: data.Senders,
|
||||
common.DATA_TX_RECIPIENTS: data.Recipients,
|
||||
common.DATA_TX_VALUES: data.TransferValues,
|
||||
common.DATA_TX_ADDRESSES: data.Addresses,
|
||||
common.DATA_TX_HASHES: data.TxHashes,
|
||||
common.DATA_TX_DATES: data.Dates,
|
||||
common.DATA_TX_SYMBOLS: data.Symbols,
|
||||
common.DATA_TX_DECIMALS: data.Decimals,
|
||||
dataMap := map[string]string{
|
||||
"txfrom": data.Senders,
|
||||
"txto": data.Recipients,
|
||||
"txval": data.TransferValues,
|
||||
"txaddr": data.Addresses,
|
||||
"txhash": data.TxHashes,
|
||||
"txdate": data.Dates,
|
||||
"txsym": data.Symbols,
|
||||
"txdeci": data.Decimals,
|
||||
}
|
||||
|
||||
for key, value := range dataMap {
|
||||
if err := h.prefixDb.Put(ctx, []byte(common.ToBytes(key)), []byte(value)); err != nil {
|
||||
if err := h.prefixDb.Put(ctx, []byte(key), []byte(value)); err != nil {
|
||||
logg.ErrorCtxf(ctx, "failed to write to prefixDb", "error", err)
|
||||
return res, err
|
||||
}
|
||||
@ -1783,22 +1740,22 @@ func (h *Handlers) GetTransactionsList(ctx context.Context, sym string, input []
|
||||
}
|
||||
|
||||
// Read transactions from the store and format them
|
||||
TransactionSenders, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_TX_SENDERS))
|
||||
TransactionSenders, err := h.prefixDb.Get(ctx, []byte("txfrom"))
|
||||
if err != nil {
|
||||
logg.ErrorCtxf(ctx, "Failed to read the TransactionSenders from prefixDb", "error", err)
|
||||
return res, err
|
||||
}
|
||||
TransactionSyms, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_TX_SYMBOLS))
|
||||
TransactionSyms, err := h.prefixDb.Get(ctx, []byte("txsym"))
|
||||
if err != nil {
|
||||
logg.ErrorCtxf(ctx, "Failed to read the TransactionSyms from prefixDb", "error", err)
|
||||
return res, err
|
||||
}
|
||||
TransactionValues, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_TX_VALUES))
|
||||
TransactionValues, err := h.prefixDb.Get(ctx, []byte("txval"))
|
||||
if err != nil {
|
||||
logg.ErrorCtxf(ctx, "Failed to read the TransactionValues from prefixDb", "error", err)
|
||||
return res, err
|
||||
}
|
||||
TransactionDates, err := h.prefixDb.Get(ctx, common.ToBytes(common.DATA_TX_DATES))
|
||||
TransactionDates, err := h.prefixDb.Get(ctx, []byte("txdate"))
|
||||
if err != nil {
|
||||
logg.ErrorCtxf(ctx, "Failed to read the TransactionDates from prefixDb", "error", err)
|
||||
return res, err
|
||||
|
@ -22,7 +22,6 @@ import (
|
||||
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"
|
||||
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
||||
)
|
||||
@ -57,8 +56,7 @@ func InitializeTestSubPrefixDb(t *testing.T, ctx context.Context) *storage.SubPr
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
prefix := common.ToBytes(visedb.DATATYPE_USERDATA)
|
||||
spdb := storage.NewSubPrefixDb(db, prefix)
|
||||
spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
|
||||
|
||||
return spdb
|
||||
}
|
||||
@ -1500,10 +1498,10 @@ func TestValidateRecipient(t *testing.T) {
|
||||
}{
|
||||
{
|
||||
name: "Test with invalid recepient",
|
||||
input: []byte("7?1234"),
|
||||
input: []byte("9234adf5"),
|
||||
expectedResult: resource.Result{
|
||||
FlagSet: []uint32{flag_invalid_recipient},
|
||||
Content: "7?1234",
|
||||
Content: "9234adf5",
|
||||
},
|
||||
},
|
||||
{
|
||||
@ -1519,40 +1517,22 @@ func TestValidateRecipient(t *testing.T) {
|
||||
input: []byte("0711223344"),
|
||||
expectedResult: resource.Result{},
|
||||
},
|
||||
{
|
||||
name: "Test with address",
|
||||
input: []byte("0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9"),
|
||||
expectedResult: resource.Result{},
|
||||
},
|
||||
{
|
||||
name: "Test with alias recepient",
|
||||
input: []byte("alias123"),
|
||||
expectedResult: resource.Result{},
|
||||
},
|
||||
}
|
||||
|
||||
// store a public key for the valid recipient
|
||||
err = store.WriteEntry(ctx, "+254711223344", common.DATA_PUBLIC_KEY, []byte(publicKey))
|
||||
err = store.WriteEntry(ctx, "0711223344", common.DATA_PUBLIC_KEY, []byte(publicKey))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
mockAccountService := new(mocks.MockAccountService)
|
||||
// Create the Handlers instance
|
||||
h := &Handlers{
|
||||
flagManager: fm.parser,
|
||||
userdataStore: store,
|
||||
accountService: mockAccountService,
|
||||
flagManager: fm.parser,
|
||||
userdataStore: store,
|
||||
}
|
||||
|
||||
aliasResponse := &dataserviceapi.AliasAddress{
|
||||
Address: "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
|
||||
}
|
||||
|
||||
mockAccountService.On("CheckAliasAddress", string(tt.input)).Return(aliasResponse, nil)
|
||||
|
||||
// Call the method
|
||||
res, err := h.ValidateRecipient(ctx, "validate_recepient", tt.input)
|
||||
|
||||
@ -1584,7 +1564,7 @@ func TestCheckBalance(t *testing.T) {
|
||||
publicKey: "0X98765432109",
|
||||
activeSym: "ETH",
|
||||
activeBal: "1.5",
|
||||
expectedResult: resource.Result{Content: "Balance: 1.50 ETH\n"},
|
||||
expectedResult: resource.Result{Content: "Balance: 1.5 ETH\n"},
|
||||
expectError: false,
|
||||
},
|
||||
}
|
||||
@ -1939,7 +1919,7 @@ func TestCheckVouchers(t *testing.T) {
|
||||
assert.NoError(t, err)
|
||||
|
||||
// Read voucher sym data from the store
|
||||
voucherData, err := spdb.Get(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS))
|
||||
voucherData, err := spdb.Get(ctx, []byte("sym"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@ -1963,7 +1943,7 @@ func TestGetVoucherList(t *testing.T) {
|
||||
expectedSym := []byte("1:SRF\n2:MILO")
|
||||
|
||||
// Put voucher sym data from the store
|
||||
err := spdb.Put(ctx, common.ToBytes(common.DATA_VOUCHER_SYMBOLS), expectedSym)
|
||||
err := spdb.Put(ctx, []byte("sym"), expectedSym)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@ -1993,16 +1973,16 @@ func TestViewVoucher(t *testing.T) {
|
||||
}
|
||||
|
||||
// Define mock voucher data
|
||||
mockData := map[common.DataTyp][]byte{
|
||||
common.DATA_VOUCHER_SYMBOLS: []byte("1:SRF\n2:MILO"),
|
||||
common.DATA_VOUCHER_BALANCES: []byte("1:100\n2:200"),
|
||||
common.DATA_VOUCHER_DECIMALS: []byte("1:6\n2:4"),
|
||||
common.DATA_VOUCHER_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
|
||||
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(common.ToBytes(key)), []byte(value))
|
||||
err = spdb.Put(ctx, []byte(key), []byte(value))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@ -2010,7 +1990,7 @@ func TestViewVoucher(t *testing.T) {
|
||||
|
||||
res, err := h.ViewVoucher(ctx, "view_voucher", []byte("1"))
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, res.Content, "Symbol: SRF\nBalance: 100")
|
||||
assert.Equal(t, res.Content, "SRF\n100")
|
||||
}
|
||||
|
||||
func TestSetVoucher(t *testing.T) {
|
||||
|
@ -6,6 +6,10 @@ import (
|
||||
"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)
|
||||
@ -31,13 +35,13 @@ func (s *SubPrefixDb) toKey(k []byte) []byte {
|
||||
}
|
||||
|
||||
func (s *SubPrefixDb) Get(ctx context.Context, key []byte) ([]byte, error) {
|
||||
s.store.SetPrefix(db.DATATYPE_USERDATA)
|
||||
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(db.DATATYPE_USERDATA)
|
||||
s.store.SetPrefix(DATATYPE_USERSUB)
|
||||
key = s.toKey(key)
|
||||
return s.store.Put(ctx, key, val)
|
||||
}
|
@ -49,6 +49,6 @@ func (m *MockAccountService) TokenTransfer(ctx context.Context, amount, from, to
|
||||
}
|
||||
|
||||
func (m *MockAccountService) CheckAliasAddress(ctx context.Context, alias string) (*dataserviceapi.AliasAddress, error) {
|
||||
args := m.Called(alias)
|
||||
args := m.Called()
|
||||
return args.Get(0).(*dataserviceapi.AliasAddress), args.Error(1)
|
||||
}
|
||||
|
@ -1,9 +1,6 @@
|
||||
package utils
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
import "time"
|
||||
|
||||
// CalculateAge calculates the age based on a given birthdate and the current date in the format dd/mm/yy
|
||||
// It adjusts for cases where the current date is before the birthday in the current year.
|
||||
@ -28,29 +25,11 @@ func CalculateAge(birthdate, today time.Time) int {
|
||||
// It subtracts the YOB from the current year to determine the age.
|
||||
//
|
||||
// Parameters:
|
||||
//
|
||||
// yob: The year of birth as an integer.
|
||||
// yob: The year of birth as an integer.
|
||||
//
|
||||
// Returns:
|
||||
//
|
||||
// The calculated age as an integer.
|
||||
// The calculated age as an integer.
|
||||
func CalculateAgeWithYOB(yob int) int {
|
||||
currentYear := time.Now().Year()
|
||||
return currentYear - yob
|
||||
}
|
||||
|
||||
|
||||
//IsValidYob checks if the provided yob can be considered valid
|
||||
func IsValidYOb(yob string) bool {
|
||||
currentYear := time.Now().Year()
|
||||
yearOfBirth, err := strconv.ParseInt(yob, 10, 64)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
if yearOfBirth >= 1900 && int(yearOfBirth) <= currentYear {
|
||||
return true
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
|
||||
}
|
||||
currentYear := time.Now().Year()
|
||||
return currentYear - yob
|
||||
}
|
@ -1,17 +0,0 @@
|
||||
package utils
|
||||
|
||||
func ConstructName(firstName, familyName, defaultValue string) string {
|
||||
name := defaultValue
|
||||
if familyName != defaultValue {
|
||||
if firstName != defaultValue {
|
||||
name = firstName + " " + familyName
|
||||
} else {
|
||||
name = familyName
|
||||
}
|
||||
} else {
|
||||
if firstName != defaultValue {
|
||||
name = firstName
|
||||
}
|
||||
}
|
||||
return name
|
||||
}
|
@ -54,7 +54,7 @@
|
||||
},
|
||||
{
|
||||
"input": "1235",
|
||||
"expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
|
||||
"expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
|
||||
},
|
||||
{
|
||||
"input": "1",
|
||||
@ -62,7 +62,7 @@
|
||||
},
|
||||
{
|
||||
"input": "1234",
|
||||
"expectedContent": "Select language:\n0:English\n1:Kiswahili"
|
||||
"expectedContent": "Select language:\n0:english\n1:kiswahili"
|
||||
},
|
||||
{
|
||||
"input": "0",
|
||||
@ -95,7 +95,7 @@
|
||||
},
|
||||
{
|
||||
"input": "1235",
|
||||
"expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
|
||||
"expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
|
||||
},
|
||||
{
|
||||
"input": "1",
|
||||
@ -141,7 +141,7 @@
|
||||
},
|
||||
{
|
||||
"input": "1235",
|
||||
"expectedContent": "Incorrect PIN\n1:Retry\n9:Quit"
|
||||
"expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
|
||||
},
|
||||
{
|
||||
"input": "1",
|
||||
|
@ -7,11 +7,11 @@
|
||||
"steps": [
|
||||
{
|
||||
"input": "",
|
||||
"expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
|
||||
"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"
|
||||
"expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
|
||||
},
|
||||
{
|
||||
"input": "0",
|
||||
@ -40,11 +40,11 @@
|
||||
"steps": [
|
||||
{
|
||||
"input": "",
|
||||
"expectedContent": "Welcome to Sarafu Network\nPlease select a language\n0:English\n1:Kiswahili"
|
||||
"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"
|
||||
"expectedContent": "Do you agree to terms and conditions?\n0:yes\n1:no"
|
||||
},
|
||||
{
|
||||
"input": "1",
|
||||
|
@ -1 +0,0 @@
|
||||
Tatizo la kimtambo limetokea,tafadhali jaribu tena baadaye.
|
@ -1 +0,0 @@
|
||||
English
|
@ -1 +1 @@
|
||||
Incorrect PIN
|
||||
Incorrect pin
|
@ -1 +1 @@
|
||||
PIN mpya na udhibitisho wa PIN mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.
|
||||
PIN mpya na udhibitisho wa pin mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.
|
||||
|
@ -1 +0,0 @@
|
||||
Kiswahili
|
@ -13,7 +13,7 @@ msgstr "Kwa usaidizi zaidi,piga: 0757628885"
|
||||
msgid "Balance: %s\n"
|
||||
msgstr "Salio: %s\n"
|
||||
|
||||
msgid "Your invite request for %s to Sarafu Network failed. Please try again later."
|
||||
msid "Your invite request for %s to Sarafu Network failed. Please try again later."
|
||||
msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu halikufaulu. Tafadhali jaribu tena baadaye."
|
||||
|
||||
msgid "Your invitation to %s to join Sarafu Network has been sent."
|
||||
@ -23,7 +23,4 @@ msgid "Your request failed. Please try again later."
|
||||
msgstr "Ombi lako halikufaulu. Tafadhali jaribu tena baadaye."
|
||||
|
||||
msgid "Community Balance: 0.00"
|
||||
msgstr "Salio la Kikundi: 0.00"
|
||||
|
||||
msgid "Symbol: %s\nBalance: %s"
|
||||
msgstr "Sarafu: %s\nSalio: %s"
|
||||
msgid "Salio la Kikundi: 0.00"
|
||||
|
@ -1,10 +1,10 @@
|
||||
LOAD set_default_voucher 8
|
||||
RELOAD set_default_voucher
|
||||
LOAD check_balance 64
|
||||
RELOAD check_balance
|
||||
LOAD check_vouchers 10
|
||||
RELOAD check_vouchers
|
||||
LOAD check_balance 128
|
||||
RELOAD check_balance
|
||||
CATCH api_failure flag_api_call_error 1
|
||||
CATCH api_failure flag_api_call_error 1
|
||||
MAP check_balance
|
||||
MOUT send 1
|
||||
MOUT vouchers 2
|
||||
|
@ -1 +1 @@
|
||||
{{.check_balance}}
|
||||
Salio lako ni: 0.00 SRF
|
@ -1 +0,0 @@
|
||||
Next
|
@ -1 +0,0 @@
|
||||
Mbele
|
@ -1 +1 @@
|
||||
No
|
||||
no
|
@ -1 +1 @@
|
||||
La
|
||||
la
|
@ -1 +0,0 @@
|
||||
Prev
|
@ -1 +0,0 @@
|
||||
Nyuma
|
@ -1,4 +1,3 @@
|
||||
LOAD set_language 6
|
||||
RELOAD set_language
|
||||
CATCH terms flag_account_created 0
|
||||
MOVE language_changed
|
||||
|
@ -1,4 +1,3 @@
|
||||
LOAD set_language 6
|
||||
RELOAD set_language
|
||||
CATCH terms flag_account_created 0
|
||||
MOVE language_changed
|
||||
|
@ -1 +1 @@
|
||||
Yes
|
||||
yes
|
@ -1 +1 @@
|
||||
Ndio
|
||||
ndio
|
Loading…
Reference in New Issue
Block a user