Remove obsolete track account status code

This commit is contained in:
lash 2024-10-31 11:43:27 +00:00
parent dc198215b1
commit b9c56b04ce
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
3 changed files with 10 additions and 20 deletions

View File

@ -7,7 +7,6 @@ import (
"log"
"path"
"testing"
"time"
"git.defalsify.org/vise.git/asm"
"git.defalsify.org/vise.git/db"
@ -1064,11 +1063,7 @@ func TestCheckAccountStatus(t *testing.T) {
},
},
response: &models.TrackStatusResult {
CreatedAt: time.Now(),
Status: "SUCCESS",
TransferValue: json.Number("0.5"),
TxHash: "0x123abc456def",
TxType: "transfer",
Active: true,
},
expectedResult: resource.Result{
FlagSet: []uint32{flag_account_success},
@ -1079,11 +1074,7 @@ func TestCheckAccountStatus(t *testing.T) {
name: "Test when the account is not yet on the sarafu network",
input: []byte("TrackingId1234"),
response: &models.TrackStatusResult{
CreatedAt: time.Now(),
Status: "SUCCESS",
TransferValue: json.Number("0.5"),
TxHash: "0x123abc456def",
TxType: "transfer",
Active: false,
},
serverResponse: &api.OKResponse{
Ok: true,
@ -1109,13 +1100,13 @@ func TestCheckAccountStatus(t *testing.T) {
flagManager: fm.parser,
}
status := tt.response.Status
status := tt.response.Active
// Define expected interactions with the mock
mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_PUBLIC_KEY).Return(tt.input, nil)
mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.response, nil)
mockCreateAccountService.On("TrackAccountStatus", string(tt.input)).Return(tt.serverResponse, nil)
mockDataStore.On("WriteEntry", ctx, sessionId, common.DATA_ACCOUNT_STATUS, []byte(status)).Return(nil).Maybe()
mockDataStore.On("WriteEntry", ctx, sessionId, common.DATA_ACCOUNT_STATUS, status).Return(nil).Maybe()
// Call the method under test
res, _ := h.CheckAccountStatus(ctx, "check_account_status", tt.input)

View File

@ -5,10 +5,14 @@ import (
"time"
)
type TrackStatusResult struct {
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 {
Active bool `json:"active"`
}

View File

@ -3,7 +3,6 @@ package testservice
import (
"context"
"encoding/json"
"time"
"git.grassecon.net/urdt/ussd/internal/models"
"github.com/grassrootseconomics/eth-custodial/pkg/api"
@ -30,11 +29,7 @@ func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey strin
func (tas *TestAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) {
return &models.TrackStatusResult {
CreatedAt: time.Now(),
Status: "SUCCESS",
TransferValue: json.Number("0.5"),
TxHash: "0x123abc456def",
TxType: "transfer",
Active: true,
}, nil
}