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

Expose methods required for the stream sync service #147

Closed
lash wants to merge 34 commits from lash/export-to-term into pre-mock-remove
pull from: lash/export-to-term
merge into: urdt:pre-mock-remove
Conversation 1 Commits 34 Files Changed 33 -34
6 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc198215b1 - Show all commits

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

@ -705,7 +705,6 @@ func (h *Handlers) FetchCustodialBalances(ctx context.Context, sym string, input
} }
res.FlagReset = append(res.FlagReset, flag_api_error) res.FlagReset = append(res.FlagReset, flag_api_error)
//balance := balanceResponse.Result.Balance
balance := balanceResponse.Balance balance := balanceResponse.Balance
switch balanceType { switch balanceType {

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

@ -815,7 +815,6 @@ func TestAuthorize(t *testing.T) {
// Create required mocks // Create required mocks
mockDataStore := new(mocks.MockUserDataStore) mockDataStore := new(mocks.MockUserDataStore)
mockCreateAccountService := new(mocks.MockAccountService) mockCreateAccountService := new(mocks.MockAccountService)
//expectedResult := resource.Result{}
mockState := state.NewState(16) mockState := state.NewState(16)
flag_incorrect_pin, _ := fm.GetFlag("flag_incorrect_pin") flag_incorrect_pin, _ := fm.GetFlag("flag_incorrect_pin")
flag_account_authorized, _ := fm.GetFlag("flag_account_authorized") flag_account_authorized, _ := fm.GetFlag("flag_account_authorized")

8
internal/models/balanceresponse.go
View File

@ -3,14 +3,6 @@ package models
import "encoding/json" import "encoding/json"
//type BalanceResponse struct {
// Ok bool `json:"ok"`
// Result struct {
// Balance string `json:"balance"`
// Nonce json.Number `json:"nonce"`
// } `json:"result"`
//}
//
type BalanceResult struct { type BalanceResult struct {
Balance string `json:"balance"` Balance string `json:"balance"`
Nonce json.Number `json:"nonce"` Nonce json.Number `json:"nonce"`

7
internal/models/trackstatusresponse.go
View File

@ -4,13 +4,6 @@ import (
"encoding/json" "encoding/json"
"time" "time"
) )
//type Transaction struct {
// CreatedAt time.Time `json:"createdAt"`
// Status string `json:"status"`
// TransferValue json.Number `json:"transferValue"`
// TxHash string `json:"txHash"`
// TxType string `json:"txType"`
//}
type TrackStatusResult struct { type TrackStatusResult struct {
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`

1
internal/models/vouchersresponse.go
View File

@ -1 +0,0 @@
package models

16
remote/accountservice.go
View File

@ -18,15 +18,12 @@ var (
) )
type AccountServiceInterface interface { type AccountServiceInterface interface {
//CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResponse, error)
CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error) CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error)
CreateAccount(ctx context.Context) (*models.AccountResult, error) CreateAccount(ctx context.Context) (*models.AccountResult, error)
//CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResponse, error)
// TODO: poorly named method seems to be checking transaction // TODO: poorly named method seems to be checking transaction
CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error)
TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error)
FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error)
//FetchVouchers(ctx context.Context, publicKey string) (*api.OKResponse, error)
} }
type AccountService struct { type AccountService struct {
@ -169,19 +166,6 @@ func (as *AccountService) FetchVouchers(ctx context.Context, publicKey string) (
} }
return r, nil return r, nil
//
// file, err := os.Open("sample_tokens.json")
// if err != nil {
// return nil, err
// }
// defer file.Close()
// var holdings models.VoucherHoldingResponse
//
// if err := json.NewDecoder(file).Decode(&holdings); err != nil {
// return nil, err
// }
// return &holdings, nil
} }
func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) { func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {