urdt/ussd
5
0
Fork 1
Code Issues 59 Pull Requests 4 Actions 1 Packages Projects Releases Wiki Activity

data-items-cleanup #203

Merged
lash merged 12 commits from data-items-cleanup into master 2024-12-05 16:03:50 +01:00
Conversation 0 Commits 12 Files Changed 8 +26 -26
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 18423fcd9c - Show all commits

8
common/db.go
View File

@ -32,10 +32,10 @@ const (
DATA_PUBLIC_KEY_REVERSE DATA_PUBLIC_KEY_REVERSE
DATA_ACTIVE_DECIMAL DATA_ACTIVE_DECIMAL
DATA_ACTIVE_ADDRESS DATA_ACTIVE_ADDRESS
DATA_PREFIX_SYMBOLS DATA_VOUCHER_SYMBOLS
Alfred-mk marked this conversation as resolved Outdated
lash commented 2024-12-04 22:13:47 +01:00
Outdated
Review
Copy Link

Perhaps better name DATA_VOUCHER_* ?

Perhaps better name `DATA_VOUCHER_*` ?
DATA_PREFIX_BALANCES DATA_VOUCHER_BALANCES
Alfred-mk marked this conversation as resolved Outdated
lash commented 2024-12-05 02:12:34 +01:00
Outdated
Review
Copy Link

I would start at 256 (0x0100), and keep the DATATYPE_USERDATA prefix.

I would start at 256 (0x0100), and keep the DATATYPE_USERDATA prefix.
DATA_PREFIX_DECIMALS DATA_VOUCHER_DECIMALS
DATA_PREFIX_ADDRESSES DATA_VOUCHER_ADDRESSES
DATA_PREFIX_TX_SENDERS DATA_PREFIX_TX_SENDERS
DATA_PREFIX_TX_RECIPIENTS DATA_PREFIX_TX_RECIPIENTS
Alfred-mk marked this conversation as resolved Outdated
lash commented 2024-12-05 15:45:15 +01:00
Outdated
Review
Copy Link

Sorry perhaps it wasn't clear. The "PREFIX" part in general is implied and a thus redundant. TX should suffice.

Sorry perhaps it wasn't clear. The "PREFIX" part in general is implied and a thus redundant. TX should suffice.
Alfred-mk commented 2024-12-05 15:59:56 +01:00
Outdated
Review
Copy Link

Apologies, I was to replace these as well. This has been done

Apologies, I was to replace these as well. This has been done
DATA_PREFIX_TX_VALUES DATA_PREFIX_TX_VALUES

12
common/vouchers.go
View File

@ -64,22 +64,22 @@ func ScaleDownBalance(balance, decimals string) string {
// GetVoucherData retrieves and matches voucher data // GetVoucherData retrieves and matches voucher data
func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) { func GetVoucherData(ctx context.Context, db storage.PrefixDb, input string) (*dataserviceapi.TokenHoldings, error) {
keys := []DataTyp{DATA_PREFIX_SYMBOLS, DATA_PREFIX_BALANCES, DATA_PREFIX_DECIMALS, DATA_PREFIX_ADDRESSES} keys := []DataTyp{DATA_VOUCHER_SYMBOLS, DATA_VOUCHER_BALANCES, DATA_VOUCHER_DECIMALS, DATA_VOUCHER_ADDRESSES}
data := make(map[DataTyp]string) data := make(map[DataTyp]string)
for _, key := range keys { for _, key := range keys {
value, err := db.Get(ctx, key.ToBytes()) value, err := db.Get(ctx, key.ToBytes())
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get %s: %v", key.ToBytes(), err) return nil, fmt.Errorf("failed to get %s: %v", key.ToBytes(), err)
} }
data[key] = string(value) data[key] = string(value)
} }
symbol, balance, decimal, address := MatchVoucher(input, symbol, balance, decimal, address := MatchVoucher(input,
data[DATA_PREFIX_SYMBOLS], data[DATA_VOUCHER_SYMBOLS],
data[DATA_PREFIX_BALANCES], data[DATA_VOUCHER_BALANCES],
data[DATA_PREFIX_DECIMALS], data[DATA_VOUCHER_DECIMALS],
data[DATA_PREFIX_ADDRESSES], data[DATA_VOUCHER_ADDRESSES],
) )
if symbol == "" { if symbol == "" {

10
common/vouchers_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/alecthomas/assert/v2" "github.com/alecthomas/assert/v2"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"git.grassecon.net/urdt/ussd/internal/storage"
memdb "git.defalsify.org/vise.git/db/mem" memdb "git.defalsify.org/vise.git/db/mem"
"git.grassecon.net/urdt/ussd/internal/storage"
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api" dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
) )
@ -87,10 +87,10 @@ func TestGetVoucherData(t *testing.T) {
// Test voucher data // Test voucher data
mockData := map[DataTyp][]byte{ mockData := map[DataTyp][]byte{
DATA_PREFIX_SYMBOLS: []byte("1:SRF\n2:MILO"), DATA_VOUCHER_SYMBOLS: []byte("1:SRF\n2:MILO"),
DATA_PREFIX_BALANCES: []byte("1:100\n2:200"), DATA_VOUCHER_BALANCES: []byte("1:100\n2:200"),
DATA_PREFIX_DECIMALS: []byte("1:6\n2:4"), DATA_VOUCHER_DECIMALS: []byte("1:6\n2:4"),
DATA_PREFIX_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), DATA_VOUCHER_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
} }
// Put the data // Put the data

10
internal/handlers/ussd/menuhandler.go
View File

@ -1577,10 +1577,10 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)
// Store all voucher data // Store all voucher data
dataMap := map[common.DataTyp]string{ dataMap := map[common.DataTyp]string{
common.DATA_PREFIX_SYMBOLS: data.Symbols, common.DATA_VOUCHER_SYMBOLS: data.Symbols,
common.DATA_PREFIX_BALANCES: data.Balances, common.DATA_VOUCHER_BALANCES: data.Balances,
common.DATA_PREFIX_DECIMALS: data.Decimals, common.DATA_VOUCHER_DECIMALS: data.Decimals,
common.DATA_PREFIX_ADDRESSES: data.Addresses, common.DATA_VOUCHER_ADDRESSES: data.Addresses,
} }
for key, value := range dataMap { for key, value := range dataMap {
@ -1597,7 +1597,7 @@ func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte)
var res resource.Result var res resource.Result
// Read vouchers from the store // Read vouchers from the store
voucherData, err := h.prefixDb.Get(ctx, common.DATA_PREFIX_SYMBOLS.ToBytes()) voucherData, err := h.prefixDb.Get(ctx, common.DATA_VOUCHER_SYMBOLS.ToBytes())
if err != nil { if err != nil {
logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err) logg.ErrorCtxf(ctx, "Failed to read the voucherData from prefixDb", "error", err)
return res, err return res, err

12
internal/handlers/ussd/menuhandler_test.go
View File

@ -1937,7 +1937,7 @@ func TestCheckVouchers(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
// Read voucher sym data from the store // Read voucher sym data from the store
voucherData, err := spdb.Get(ctx, common.DATA_PREFIX_SYMBOLS.ToBytes()) voucherData, err := spdb.Get(ctx, common.DATA_VOUCHER_SYMBOLS.ToBytes())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1961,7 +1961,7 @@ func TestGetVoucherList(t *testing.T) {
expectedSym := []byte("1:SRF\n2:MILO") expectedSym := []byte("1:SRF\n2:MILO")
// Put voucher sym data from the store // Put voucher sym data from the store
err := spdb.Put(ctx, common.DATA_PREFIX_SYMBOLS.ToBytes(), expectedSym) err := spdb.Put(ctx, common.DATA_VOUCHER_SYMBOLS.ToBytes(), expectedSym)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1992,10 +1992,10 @@ func TestViewVoucher(t *testing.T) {
// Define mock voucher data // Define mock voucher data
mockData := map[common.DataTyp][]byte{ mockData := map[common.DataTyp][]byte{
common.DATA_PREFIX_SYMBOLS: []byte("1:SRF\n2:MILO"), common.DATA_VOUCHER_SYMBOLS: []byte("1:SRF\n2:MILO"),
common.DATA_PREFIX_BALANCES: []byte("1:100\n2:200"), common.DATA_VOUCHER_BALANCES: []byte("1:100\n2:200"),
common.DATA_PREFIX_DECIMALS: []byte("1:6\n2:4"), common.DATA_VOUCHER_DECIMALS: []byte("1:6\n2:4"),
common.DATA_PREFIX_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"), common.DATA_VOUCHER_ADDRESSES: []byte("1:0xd4c288865Ce\n2:0x41c188d63Qa"),
} }
// Put the data // Put the data