common/db.go

@@ -88,10 +88,3 @@ func (d DataTyp) ToBytes() []byte {
 	binary.BigEndian.PutUint16(bytes, uint16(d))
 	return bytes
 }
-
-// Convert int to []byte
-func IntToBytes(value int) []byte {
-	bytes := make([]byte, 2)
-	binary.BigEndian.PutUint16(bytes, uint16(value))
-	return bytes
-}

common/vouchers_test.go

@@ -8,7 +8,6 @@ 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"
 	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
@@ -84,9 +83,7 @@ func TestGetVoucherData(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
+	spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
-	prefix := IntToBytes(visedb.DATATYPE_USERDATA)
-	spdb := storage.NewSubPrefixDb(db, prefix)
 
 	// Test voucher data
 	mockData := map[DataTyp][]byte{

internal/handlers/ussd/menuhandler.go

@@ -85,10 +85,8 @@ func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *util
 	userDb := &common.UserDataStore{
 		Db: userdataStore,
 	}
-
+	// Instantiate the SubPrefixDb with "vouchers" prefix
-	// Instantiate the SubPrefixDb with "DATATYPE_USERDATA" prefix
+	prefixDb := storage.NewSubPrefixDb(userdataStore, []byte("vouchers"))
-	prefix := common.IntToBytes(db.DATATYPE_USERDATA)
-	prefixDb := storage.NewSubPrefixDb(userdataStore, prefix)
 
 	h := &Handlers{
 		userdataStore:  userDb,

internal/handlers/ussd/menuhandler_test.go

@@ -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.IntToBytes(visedb.DATATYPE_USERDATA)
+	spdb := storage.NewSubPrefixDb(db, []byte("vouchers"))
-	spdb := storage.NewSubPrefixDb(db, prefix)
 
 	return spdb
 }