Bug fixes and tidying up

.circleci/config.yml

@@ -7,15 +7,22 @@ reset_dbs: &reset_dbs
     name: RESET DBs
     command: |
         if [[ ${CIRCLE_BRANCH} == *"reset-db"* ]]; then
-          for host in $ln1 $ln2 $ln3; do ssh root@$host 'for f in *.db; do mv -- "$f" "_$f"; done'; done
+          for host in $ln1 $ln2 $ln3; do
+            echo "Trying to reset db on $host"
+            ssh root@$host 'cd /root/zoobc/resource && for f in *.db; do mv -- "$f" "_$f"; done && rm -rf snapshots* *_kv';
+          done;
+        else
+          echo "All good without reset db";
         fi
 reset_db: &reset_db
     name: RESET DB
     command: |
         if [[ ${CIRCLE_BRANCH} == *"reset-db"* ]]; then
-          ssh root@$ln4 'for f in *.db; do mv -- "$f" "_$f"; done';
+          echo "Trying to reset db on ${ln4}"
+          ssh root@$ln4 'cd /root/zoobc/resource && for f in *.db; do mv -- "$f" "_$f"; done && rm -rf snapsnots* *_kv';
+        else
+         echo "All good without reset db"
         fi
-
 jobs:
     prepare:
         <<: *defaults

.gitignore

@@ -19,9 +19,12 @@ resource/zoobc_*
 resource/snapshots*
 resource_cluster/zoobc_*
 resource/*.prof
+resource/generated
 cmd/*.new
 accounts.txt
 .editorconfig
 .manual
 release/
 github.token
+*.back
+*.bak

api/client/GetAccountBalances/client.go

@@ -0,0 +1,48 @@
+package main
+
+import (
+	"context"
+	"fmt"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+	rpc_model "github.com/zoobc/zoobc-core/common/model"
+	rpc_service "github.com/zoobc/zoobc-core/common/service"
+	"github.com/zoobc/zoobc-core/common/util"
+	"google.golang.org/grpc"
+)
+
+func main() {
+	var apiRPCPort int
+	if err := util.LoadConfig("../../../resource", "config", "toml"); err != nil {
+		log.Fatal(err)
+	} else {
+		apiRPCPort = viper.GetInt("apiRPCPort")
+		if apiRPCPort == 0 {
+			apiRPCPort = 8080
+		}
+	}
+
+	conn, err := grpc.Dial(fmt.Sprintf(":%d", apiRPCPort), grpc.WithInsecure())
+	if err != nil {
+		log.Fatalf("did not connect: %s", err)
+	}
+	defer conn.Close()
+
+	c := rpc_service.NewAccountBalanceServiceClient(conn)
+
+	response, err := c.GetAccountBalances(context.Background(), &rpc_model.GetAccountBalancesRequest{
+		AccountAddresses: []string{
+			"OnEYzI-EMV6UTfoUEzpQUjkSlnqB82-SyRN7469lJTWH",
+			"BCZEGOb3WNx3fDOVf9ZS4EjvOIv_UeW4TVBQJ_6tHKlE",
+			"iSJt3H8wFOzlWKsy_UoEWF_OjF6oymHMqthyUMDKSyxb",
+		},
+	})
+
+	if err != nil {
+		log.Fatalf("error calling rpc_service.GetAccountBalance: %s", err)
+	}
+
+	log.Printf("response from remote rpc_service.GetBlockByID(): %s", response)
+
+}

api/handler/accountBalanceHandler.go

@@ -5,11 +5,15 @@ import (
 
 	"github.com/zoobc/zoobc-core/api/service"
 	"github.com/zoobc/zoobc-core/common/model"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
-type AccountBalanceHandler struct {
-	Service service.AccountBalanceServiceInterface
-}
+type (
+	AccountBalanceHandler struct {
+		Service service.AccountBalanceServiceInterface
+	}
+)
 
 func (abh *AccountBalanceHandler) GetAccountBalance(ctx context.Context,
 	request *model.GetAccountBalanceRequest) (*model.GetAccountBalanceResponse, error) {
@@ -22,6 +26,10 @@ func (abh *AccountBalanceHandler) GetAccountBalance(ctx context.Context,
 
 func (abh *AccountBalanceHandler) GetAccountBalances(ctx context.Context,
 	request *model.GetAccountBalancesRequest) (*model.GetAccountBalancesResponse, error) {
-	// todo: implement this after have filter
-	return nil, nil
+
+	if len(request.AccountAddresses) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "At least 1 address is required")
+	}
+
+	return abh.Service.GetAccountBalances(request)
 }

api/handler/accountBalanceHandler_test.go

@@ -0,0 +1,161 @@
+package handler
+
+import (
+	"context"
+	"errors"
+	"reflect"
+	"testing"
+
+	"github.com/zoobc/zoobc-core/api/service"
+	"github.com/zoobc/zoobc-core/common/model"
+)
+
+type (
+	mockGetAccountBalanceError struct {
+		service.AccountBalanceServiceInterface
+	}
+	mockGetAccountBalanceSuccess struct {
+		service.AccountBalanceServiceInterface
+	}
+)
+
+func (*mockGetAccountBalanceError) GetAccountBalance(request *model.GetAccountBalanceRequest) (*model.GetAccountBalanceResponse, error) {
+	return nil, errors.New("error GetAccountBalance")
+}
+func (*mockGetAccountBalanceSuccess) GetAccountBalance(request *model.GetAccountBalanceRequest) (*model.GetAccountBalanceResponse, error) {
+	return &model.GetAccountBalanceResponse{
+		AccountBalance: &model.AccountBalance{
+			AccountAddress: request.AccountAddress,
+		},
+	}, nil
+}
+
+func TestAccountBalanceHandler_GetAccountBalance(t *testing.T) {
+	type fields struct {
+		Service service.AccountBalanceServiceInterface
+	}
+	type args struct {
+		ctx     context.Context
+		request *model.GetAccountBalanceRequest
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    *model.GetAccountBalanceResponse
+		wantErr bool
+	}{
+		{
+			name: "GetAccountBalance:fail",
+			fields: fields{
+				Service: &mockGetAccountBalanceError{},
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "GetAccountBalance:success",
+			fields: fields{
+				Service: &mockGetAccountBalanceSuccess{},
+			},
+			args: args{
+				request: &model.GetAccountBalanceRequest{
+					AccountAddress: "BCZnSfqpP5tqFQlMTYkDeBVFWnbyVK7vLr5ORFpTjgtN",
+				},
+			},
+			want: &model.GetAccountBalanceResponse{
+				AccountBalance: &model.AccountBalance{
+					AccountAddress: "BCZnSfqpP5tqFQlMTYkDeBVFWnbyVK7vLr5ORFpTjgtN",
+				},
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			abh := &AccountBalanceHandler{
+				Service: tt.fields.Service,
+			}
+			got, err := abh.GetAccountBalance(tt.args.ctx, tt.args.request)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("AccountBalanceHandler.GetAccountBalance() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("AccountBalanceHandler.GetAccountBalance() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+type (
+	mockGetAccountBalancesSuccess struct {
+		service.AccountBalanceServiceInterface
+	}
+)
+
+func (*mockGetAccountBalancesSuccess) GetAccountBalances(request *model.GetAccountBalancesRequest) (*model.GetAccountBalancesResponse, error) {
+	return &model.GetAccountBalancesResponse{
+		AccountBalances: []*model.AccountBalance{},
+	}, nil
+}
+
+func TestAccountBalanceHandler_GetAccountBalances(t *testing.T) {
+	type fields struct {
+		Service service.AccountBalanceServiceInterface
+	}
+	type args struct {
+		ctx     context.Context
+		request *model.GetAccountBalancesRequest
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    *model.GetAccountBalancesResponse
+		wantErr bool
+	}{
+		{
+			name: "GetAccountBalancesHandler:fail",
+			args: args{
+				request: &model.GetAccountBalancesRequest{
+					AccountAddresses: []string{},
+				},
+			},
+			want:    nil,
+			wantErr: true,
+		},
+		{
+			name: "GetAccountBalancesHandler:success",
+			args: args{
+				request: &model.GetAccountBalancesRequest{
+					AccountAddresses: []string{
+						"BCZnSfqpP5tqFQlMTYkDeBVFWnbyVK7vLr5ORFpTjgtN",
+					},
+				},
+			},
+			fields: fields{
+				Service: &mockGetAccountBalancesSuccess{},
+			},
+			want: &model.GetAccountBalancesResponse{
+				AccountBalances: []*model.AccountBalance{},
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			abh := &AccountBalanceHandler{
+				Service: tt.fields.Service,
+			}
+			got, err := abh.GetAccountBalances(tt.args.ctx, tt.args.request)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("AccountBalanceHandler.GetAccountBalances() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("AccountBalanceHandler.GetAccountBalances() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}