Merge pull request #143 from flow-hydraulics/latenssi/rename-and-refa…

…ctor Rename module, refactor main.go and tokentype passing
flow-hydraulics · Aug 17, 2021 · ff872c0 · ff872c0
2 parents 4fc9af2 + f5185ba
commit ff872c0
Show file tree

Hide file tree

Showing 46 changed files with 173 additions and 213 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
-            ghcr.io/eqlabs/flow-wallet-api
+            ghcr.io/flow-hydraulics/flow-wallet-api
           # generate Docker tags based on the following events/attributes
           tags: |
             type=ref,event=branch

diff --git a/Makefile b/Makefile
@@ -1,42 +1,23 @@
-
-current_dir = $(shell pwd)
-
-cli_version = 0.25.1
-cli_image=flow-cli
-
-.PHONY: run
-up:
-	FLOW_CLI_VERSION=${cli_version} docker-compose up -d
+.PHONY: dev
+dev:
+	docker-compose up -d db emulator
+	docker-compose logs -f
 
 .PHONY: stop
 stop:
-	FLOW_CLI_VERSION=${cli_version} docker-compose stop
+	docker-compose stop
 
 .PHONY: down
 down:
-	FLOW_CLI_VERSION=${cli_version} docker-compose down
+	docker-compose down
+
+.PHONY: reset
+reset: down dev
 
 .PHONY: test
 test:
 	go test ./...
 
-.PHONY: build-cli
-build-cli:
-	docker build \
-		--network host \
-		--build-arg VERSION=${cli_version} \
-		-t ${cli_image}:${cli_version} \
-		./docker/flow-cli
-
 .PHONY: deploy
 deploy:
-	docker run --rm -it -v "${current_dir}:/app" --net host ${cli_image}:${cli_version} project deploy --update
-
-.PHONY: shell
-shell:
-	docker exec -it flow-emulator ash
-
-.PHONY: reset
-reset:
-	FLOW_CLI_VERSION=${cli_version} docker-compose down
-	FLOW_CLI_VERSION=${cli_version} docker-compose up -d
+	flow project deploy --update
diff --git a/accounts/accounts.go b/accounts/accounts.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/eqlabs/flow-wallet-api/flow_helpers"
-	"github.com/eqlabs/flow-wallet-api/keys"
-	"github.com/eqlabs/flow-wallet-api/templates"
-	"github.com/eqlabs/flow-wallet-api/templates/template_strings"
-	"github.com/eqlabs/flow-wallet-api/transactions"
+	"github.com/flow-hydraulics/flow-wallet-api/flow_helpers"
+	"github.com/flow-hydraulics/flow-wallet-api/keys"
+	"github.com/flow-hydraulics/flow-wallet-api/templates"
+	"github.com/flow-hydraulics/flow-wallet-api/templates/template_strings"
+	"github.com/flow-hydraulics/flow-wallet-api/transactions"
 	"github.com/onflow/cadence"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/client"

diff --git a/accounts/service.go b/accounts/service.go
@@ -6,14 +6,14 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/eqlabs/flow-wallet-api/datastore"
-	"github.com/eqlabs/flow-wallet-api/errors"
-	"github.com/eqlabs/flow-wallet-api/flow_helpers"
-	"github.com/eqlabs/flow-wallet-api/jobs"
-	"github.com/eqlabs/flow-wallet-api/keys"
-	"github.com/eqlabs/flow-wallet-api/templates"
-	"github.com/eqlabs/flow-wallet-api/templates/template_strings"
-	"github.com/eqlabs/flow-wallet-api/transactions"
+	"github.com/flow-hydraulics/flow-wallet-api/datastore"
+	"github.com/flow-hydraulics/flow-wallet-api/errors"
+	"github.com/flow-hydraulics/flow-wallet-api/flow_helpers"
+	"github.com/flow-hydraulics/flow-wallet-api/jobs"
+	"github.com/flow-hydraulics/flow-wallet-api/keys"
+	"github.com/flow-hydraulics/flow-wallet-api/templates"
+	"github.com/flow-hydraulics/flow-wallet-api/templates/template_strings"
+	"github.com/flow-hydraulics/flow-wallet-api/transactions"
 	"github.com/onflow/cadence"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/client"

diff --git a/accounts/store.go b/accounts/store.go
@@ -1,7 +1,7 @@
 package accounts
 
 import (
-	"github.com/eqlabs/flow-wallet-api/datastore"
+	"github.com/flow-hydraulics/flow-wallet-api/datastore"
 )
 
 // Store manages data regarding accounts.

diff --git a/accounts/store_gorm.go b/accounts/store_gorm.go
@@ -1,7 +1,7 @@
 package accounts
 
 import (
-	"github.com/eqlabs/flow-wallet-api/datastore"
+	"github.com/flow-hydraulics/flow-wallet-api/datastore"
 	"gorm.io/gorm"
 )
 

diff --git a/api/openapi.yaml b/api/openapi.yaml
@@ -519,7 +519,7 @@ components:
           Content-Type: application/json
           Connection: close
 
-        ver: https://github.com/eqlabs/flow-wallet-api/commit/
+        ver: https://github.com/flow-hydraulics/flow-wallet-api/commit/
         built on:
         api version called: v1
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,6 +2,8 @@ version: "3.9"
 services:
   db:
     image: postgres:13-alpine
+    ports:
+      - "5432:5432"
     environment:
       - POSTGRES_DB=wallet
       - POSTGRES_USER=wallet
@@ -11,11 +13,12 @@ services:
     build:
       context: .
       dockerfile: ./docker/wallet/Dockerfile
+      network: host # docker build sometimes has problems fetching from alpine's CDN
     ports:
       - "3000:3000"
     env_file:
       - ./.env
-    restart: unless-stopped      
+    restart: unless-stopped
     environment:
       DATABASE_DSN: postgresql://wallet:wallet@db:5432/wallet
       DATABASE_TYPE: psql

diff --git a/docker/flow-cli/Dockerfile b/docker/flow-cli/Dockerfile
diff --git a/flow_helpers/flow_helpers.go b/flow_helpers/flow_helpers.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/eqlabs/flow-wallet-api/errors"
+	"github.com/flow-hydraulics/flow-wallet-api/errors"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/client"
 )

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/eqlabs/flow-wallet-api
+module github.com/flow-hydraulics/flow-wallet-api
 
 go 1.16
 

diff --git a/handlers/accounts.go b/handlers/accounts.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/eqlabs/flow-wallet-api/accounts"
+	"github.com/flow-hydraulics/flow-wallet-api/accounts"
 )
 
 // Accounts is a HTTP server for account management.

diff --git a/handlers/handlers.go b/handlers/handlers.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/eqlabs/flow-wallet-api/errors"
+	"github.com/flow-hydraulics/flow-wallet-api/errors"
 )
 
 const SyncHeader = "Use-Sync"

diff --git a/handlers/jobs.go b/handlers/jobs.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/eqlabs/flow-wallet-api/jobs"
+	"github.com/flow-hydraulics/flow-wallet-api/jobs"
 )
 
 // Jobs is a HTTP server for jobs.

diff --git a/handlers/templates.go b/handlers/templates.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/eqlabs/flow-wallet-api/templates"
+	"github.com/flow-hydraulics/flow-wallet-api/templates"
 )
 
 // Templates is a HTTP server for template management.
@@ -22,7 +22,7 @@ func (s *Templates) AddToken() http.Handler {
 	return UseJson(h)
 }
 
-func (s *Templates) ListTokens(tType *templates.TokenType) http.Handler {
+func (s *Templates) ListTokens(tType templates.TokenType) http.Handler {
 	return s.MakeListTokensFunc(tType)
 }
 

diff --git a/handlers/templates_func.go b/handlers/templates_func.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/eqlabs/flow-wallet-api/templates"
+	"github.com/flow-hydraulics/flow-wallet-api/templates"
 	"github.com/gorilla/mux"
 )
 
@@ -36,7 +36,7 @@ func (s *Templates) AddTokenFunc(rw http.ResponseWriter, r *http.Request) {
 	handleJsonResponse(rw, http.StatusCreated, newToken)
 }
 
-func (s *Templates) MakeListTokensFunc(tType *templates.TokenType) http.HandlerFunc {
+func (s *Templates) MakeListTokensFunc(tType templates.TokenType) http.HandlerFunc {
 	return func(rw http.ResponseWriter, r *http.Request) {
 		tokens, err := s.service.ListTokens(tType)
 		if err != nil {

diff --git a/handlers/tokens.go b/handlers/tokens.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/eqlabs/flow-wallet-api/templates"
-	"github.com/eqlabs/flow-wallet-api/tokens"
+	"github.com/flow-hydraulics/flow-wallet-api/templates"
+	"github.com/flow-hydraulics/flow-wallet-api/tokens"
 )
 
 type Tokens struct {

diff --git a/handlers/tokens_func.go b/handlers/tokens_func.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/eqlabs/flow-wallet-api/errors"
-	"github.com/eqlabs/flow-wallet-api/templates"
-	"github.com/eqlabs/flow-wallet-api/tokens"
+	"github.com/flow-hydraulics/flow-wallet-api/errors"
+	"github.com/flow-hydraulics/flow-wallet-api/templates"
+	"github.com/flow-hydraulics/flow-wallet-api/tokens"
 	"github.com/gorilla/mux"
 )
 
@@ -39,7 +39,7 @@ func (s *Tokens) MakeAccountTokensFunc(tType templates.TokenType) http.HandlerFu
 		vars := mux.Vars(r)
 		a := vars["address"]
 
-		res, err := s.service.AccountTokens(a, &tType)
+		res, err := s.service.AccountTokens(a, tType)
 		if err != nil {
 			handleError(rw, s.log, err)
 			return

diff --git a/handlers/transactions.go b/handlers/transactions.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/eqlabs/flow-wallet-api/transactions"
+	"github.com/flow-hydraulics/flow-wallet-api/transactions"
 )
 
 type Transactions struct {

diff --git a/handlers/transactions_func.go b/handlers/transactions_func.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/eqlabs/flow-wallet-api/errors"
-	"github.com/eqlabs/flow-wallet-api/templates"
-	"github.com/eqlabs/flow-wallet-api/transactions"
+	"github.com/flow-hydraulics/flow-wallet-api/errors"
+	"github.com/flow-hydraulics/flow-wallet-api/templates"
+	"github.com/flow-hydraulics/flow-wallet-api/transactions"
 	"github.com/gorilla/mux"
 )
 

diff --git a/jobs/jobs.go b/jobs/jobs.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/eqlabs/flow-wallet-api/errors"
+	"github.com/flow-hydraulics/flow-wallet-api/errors"
 	"github.com/google/uuid"
 	"gorm.io/gorm"
 )

diff --git a/jobs/service.go b/jobs/service.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/eqlabs/flow-wallet-api/datastore"
-	"github.com/eqlabs/flow-wallet-api/errors"
+	"github.com/flow-hydraulics/flow-wallet-api/datastore"
+	"github.com/flow-hydraulics/flow-wallet-api/errors"
 	"github.com/google/uuid"
 )
 

diff --git a/jobs/store.go b/jobs/store.go
@@ -1,7 +1,7 @@
 package jobs
 
 import (
-	"github.com/eqlabs/flow-wallet-api/datastore"
+	"github.com/flow-hydraulics/flow-wallet-api/datastore"
 	"github.com/google/uuid"
 )
 

diff --git a/jobs/store_gorm.go b/jobs/store_gorm.go
@@ -1,7 +1,7 @@
 package jobs
 
 import (
-	"github.com/eqlabs/flow-wallet-api/datastore"
+	"github.com/flow-hydraulics/flow-wallet-api/datastore"
 	"github.com/google/uuid"
 	"gorm.io/gorm"
 )

diff --git a/keys/basic/keys.go b/keys/basic/keys.go
@@ -5,11 +5,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/eqlabs/flow-wallet-api/flow_helpers"
-	"github.com/eqlabs/flow-wallet-api/keys"
-	"github.com/eqlabs/flow-wallet-api/keys/encryption"
-	"github.com/eqlabs/flow-wallet-api/keys/google"
-	"github.com/eqlabs/flow-wallet-api/keys/local"
+	"github.com/flow-hydraulics/flow-wallet-api/flow_helpers"
+	"github.com/flow-hydraulics/flow-wallet-api/keys"
+	"github.com/flow-hydraulics/flow-wallet-api/keys/encryption"
+	"github.com/flow-hydraulics/flow-wallet-api/keys/google"
+	"github.com/flow-hydraulics/flow-wallet-api/keys/local"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/client"
 	"github.com/onflow/flow-go-sdk/crypto"

diff --git a/keys/google/google.go b/keys/google/google.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/caarlos0/env/v6"
-	"github.com/eqlabs/flow-wallet-api/keys"
+	"github.com/flow-hydraulics/flow-wallet-api/keys"
 	"github.com/google/uuid"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/crypto"

diff --git a/keys/local/local.go b/keys/local/local.go
@@ -5,7 +5,7 @@ import (
 	"crypto/rand"
 	"strings"
 
-	"github.com/eqlabs/flow-wallet-api/keys"
+	"github.com/flow-hydraulics/flow-wallet-api/keys"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/crypto"
 )