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

updated the name of the voucher related data

Browse Source
This commit is contained in:
Alfred Kamanda
2024-12-05 16:26:56 +03:00
parent 7a9de79aae
commit 18423fcd9c
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/db.go
View File

@@ -32,10 +32,10 @@ const (
DATA_PUBLIC_KEY_REVERSE
DATA_ACTIVE_DECIMAL
DATA_ACTIVE_ADDRESS
DATA_PREFIX_SYMBOLS
DATA_PREFIX_BALANCES
DATA_PREFIX_DECIMALS
DATA_PREFIX_ADDRESSES
DATA_VOUCHER_SYMBOLS
DATA_VOUCHER_BALANCES
DATA_VOUCHER_DECIMALS
DATA_VOUCHER_ADDRESSES
DATA_PREFIX_TX_SENDERS
DATA_PREFIX_TX_RECIPIENTS
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
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)
for _, key := range keys {
value, err := db.Get(ctx, key.ToBytes())
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)
}
symbol, balance, decimal, address := MatchVoucher(input,
data[DATA_PREFIX_SYMBOLS],
data[DATA_PREFIX_BALANCES],
data[DATA_PREFIX_DECIMALS],
data[DATA_PREFIX_ADDRESSES],
data[DATA_VOUCHER_SYMBOLS],
data[DATA_VOUCHER_BALANCES],
data[DATA_VOUCHER_DECIMALS],
data[DATA_VOUCHER_ADDRESSES],
)
if symbol == "" {

10
common/vouchers_test.go
View File

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