go.mod

@@ -9,8 +9,6 @@ require (
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1
 )
 
-require gopkg.in/dnaeon/go-vcr.v4 v4.0.1 // indirect
-
 require (
 	github.com/alecthomas/participle/v2 v2.0.0 // indirect
 	github.com/alecthomas/repr v0.2.0 // indirect

go.sum

@@ -30,8 +30,6 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/dnaeon/go-vcr.v4 v4.0.1 h1:dIFuOqqDZIJ9BTcK+DXmElzypQ6PV9fBQZSIwY+J1yM=
-gopkg.in/dnaeon/go-vcr.v4 v4.0.1/go.mod h1:65yxh9goQVrudqofKtHA4JNFWd6XZRkWfKN4YpMx7KI=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2XjI7Zan2InxSUQWrU=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/handlers/server/accountservice.go

@@ -16,7 +16,6 @@ type AccountServiceInterface interface {
 }
 
 type AccountService struct {
-	Client *http.Client
 }
 
 
@@ -35,8 +34,7 @@ type AccountService struct {
 //     If no error occurs, this will be nil.
 //
 func (as *AccountService) CheckAccountStatus(trackingId string) (string, error) {
-	resp,err := as.Client.Get(config.TrackStatusURL + trackingId)
-	// resp, err := http.Get(config.TrackStatusURL + trackingId)
+	resp, err := http.Get(config.TrackStatusURL + trackingId)
 	if err != nil {
 		return "", err
 	}
@@ -64,8 +62,7 @@ func (as *AccountService) CheckAccountStatus(trackingId string) (string, error)
 //   - publicKey: The public key associated with the account whose balance needs to be checked.
 func (as *AccountService) CheckBalance(publicKey string) (string, error) {
 
-	//resp, err := http.Get(config.BalanceURL + publicKey)
-	resp, err := as.Client.Get(config.BalanceURL + publicKey)
+	resp, err := http.Get(config.BalanceURL + publicKey)
 	if err != nil {
 		return "0.0", err
 	}
@@ -94,8 +91,7 @@ func (as *AccountService) CheckBalance(publicKey string) (string, error) {
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
 //     If no error occurs, this will be nil.
 func (as *AccountService) CreateAccount() (*models.AccountResponse, error) {
-	//resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
-	resp, err := as.Client.Post(config.CreateAccountURL, "application/json", nil)
+	resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
 	if err != nil {
 		return nil, err
 	}

internal/handlers/server/accountservice_test.go

@@ -1,126 +0,0 @@
-package server
-
-import (
-	"testing"
-
-	"github.com/alecthomas/assert/v2"
-	"gopkg.in/dnaeon/go-vcr.v4/pkg/recorder"
-)
-
-func TestCheckBalance(t *testing.T) {
-	r, err := recorder.New("custodial/balance")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := r.GetDefaultClient()
-
-	as := AccountService{
-		Client: client,
-	}
-	tests := []struct {
-		name      string
-		balance   string
-		publicKey string
-	}{
-		{
-			name:      "Test check balance with correct public key",
-			publicKey: "0x216a4A64E1e699F9d65Dd9CbD0058dAB21DeF002",
-			balance:   "3.06000000003 CELO",
-		},
-		{
-			name:      "Test check balance with public key that doesn't exist in the custodial system",
-			balance:   "",
-			publicKey: "0x216a4A64E1e699F9d65Dd9CbD0058dAB21DeF00",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			balance, err := as.CheckBalance(tt.publicKey)
-			if err != nil {
-				t.Fatalf("Failed to get balance with error %s", err)
-			}
-			if err != nil {
-
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, balance, tt.balance, "Expected balance and actual balance should be equal")
-
-		})
-	}
-
-}
-
-func TestCheckAccountStatus(t *testing.T) {
-	r, err := recorder.New("custodial/status")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := r.GetDefaultClient()
-
-	as := AccountService{
-		Client: client,
-	}
-	tests := []struct {
-		name       string
-		status     string
-		trackingId string
-	}{
-		{
-			name:       "Test check status with tracking id that exists in the custodial system",
-			trackingId: "bb23945b-65cd-4110-ac2e-a5df40572e18",
-			status:     "SUCCESS",
-		},
-		{
-			name:       "Test check status with tracking id that doesn't exist in the custodial system",
-			status:     "",
-			trackingId: "bb23945b-65cd-4110-ac2e-a5df40572e1",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			status, err := as.CheckAccountStatus(tt.trackingId)
-			if err != nil {
-				t.Fatalf("Failed to account status with error %s", err)
-			}
-			if err != nil {
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, status, tt.status, "Expected status and actual status should be equal")
-
-		})
-	}
-
-}
-
-func TestCreateAccount(t *testing.T) {
-	r, err := recorder.New("custodial/create")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Stop()
-
-	client := r.GetDefaultClient()
-
-	as := AccountService{
-		Client: client,
-	}
-	accountRes, err := as.CreateAccount()
-
-	if err != nil {
-		t.Fatalf("Failed to create an account with error %s", err)
-	}
-	if err != nil {
-		return
-	}
-	assert.NoError(t, err)
-	assert.Equal(t, accountRes.Ok, true, "account response status is true")
-
-}

internal/handlers/ussd/menuhandler.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"net/http"
 	"path"
 	"regexp"
 	"strconv"
@@ -74,13 +73,10 @@ func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db) (*Handlers, erro
 	userDb := &utils.UserDataStore{
 		Db: userdataStore,
 	}
-	client := &http.Client{}
 	h := &Handlers{
-		userdataStore: userDb,
-		flagManager:   appFlags,
-		accountService: &server.AccountService{
-			Client: client,
-		},
+		userdataStore:      userDb,
+		flagManager:        appFlags,
+		accountService:     &server.AccountService{},
 	}
 	return h, nil
 }

services/registration/transaction_pin.vis

@@ -1,4 +1,3 @@
-LOAD authorize_account 6
 MAP validate_amount
 RELOAD get_recipient
 MAP get_recipient
@@ -7,9 +6,9 @@ MAP get_sender
 MOUT back 0
 MOUT quit 9
 HALT
+LOAD authorize_account 6
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH transaction_initiated flag_account_authorized 1
 INCMP _ 0
 INCMP quit 9
-
+INCMP transaction_initiated *