Merge pull request #447 from nozim/update-examples

update SDK usage examples
onflow · Sep 25, 2023 · 25dcab0 · 25dcab0
2 parents 32654fd + c99e3dd
commit 25dcab0
Show file tree

Hide file tree

Showing 26 changed files with 609 additions and 280 deletions.
diff --git a/access/client.go b/access/client.go
@@ -27,6 +27,7 @@ import (
 	"context"
 
 	"github.com/onflow/cadence"
+
 	"github.com/onflow/flow-go-sdk"
 )
 

diff --git a/access/grpc/client.go b/access/grpc/client.go
@@ -31,8 +31,9 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/onflow/cadence"
-	"github.com/onflow/flow-go-sdk"
 	"google.golang.org/grpc/credentials/insecure"
+
+	"github.com/onflow/flow-go-sdk"
 )
 
 const EmulatorHost = "127.0.0.1:3569"

diff --git a/access/grpc/grpc.go b/access/grpc/grpc.go
@@ -18,15 +18,16 @@
 
 package grpc
 
-//go:generate go run github.com/vektra/mockery/cmd/mockery --name RPCClient --filename mock_client_test.go --inpkg
+//go:generate go run github.com/vektra/mockery/cmd/mockery --name RPCClient --structname MockRPCClient --output mocks
 
 import (
 	"context"
 
+	"google.golang.org/grpc"
+
 	"github.com/onflow/cadence"
 	"github.com/onflow/cadence/encoding/json"
 	"github.com/onflow/flow/protobuf/go/flow/access"
-	"google.golang.org/grpc"
 
 	"github.com/onflow/flow-go-sdk"
 )

diff --git a/access/grpc/grpc_test.go b/access/grpc/grpc_test.go
diff --git a/access/grpc/mock_client_test.go → access/grpc/mocks/RPCClient.go b/access/grpc/mock_client_test.go → access/grpc/mocks/RPCClient.go
diff --git a/access/http/http.go b/access/http/http.go
@@ -18,7 +18,7 @@
 
 package http
 
-//go:generate go run github.com/vektra/mockery/cmd/mockery --name handler --filename handler_mock_test.go --inpkg
+//go:generate go run github.com/vektra/mockery/cmd/mockery --name handler --structname mockHandler --filename=mock_handler.go --inpkg
 
 import (
 	"context"
@@ -31,8 +31,9 @@ import (
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/access/http/models"
 
-	"github.com/onflow/cadence"
 	"github.com/pkg/errors"
+
+	"github.com/onflow/cadence"
 )
 
 // handler interface defines methods needed to be offered by a specific http network implementation.

diff --git a/access/http/handler_mock_test.go → access/http/mock_handler.go b/access/http/handler_mock_test.go → access/http/mock_handler.go
diff --git a/account_test.go b/account_test.go
@@ -23,8 +23,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/onflow/flow-go-sdk/crypto"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/onflow/flow-go-sdk/crypto"
 )
 
 func generateKey() crypto.PrivateKey {

diff --git a/client/client.go b/client/client.go
@@ -22,9 +22,10 @@
 package client
 
 import (
+	"github.com/onflow/flow/protobuf/go/flow/access"
+
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/access/grpc"
-	"github.com/onflow/flow/protobuf/go/flow/access"
 )
 
 // New creates an gRPC client exposing all the common access APIs.

diff --git a/crypto/awskms/awskms.go b/crypto/awskms/awskms.go
@@ -31,6 +31,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	kms "github.com/aws/aws-sdk-go-v2/service/kms"
 	"github.com/aws/aws-sdk-go-v2/service/kms/types"
+
 	"github.com/onflow/flow-go-sdk/crypto"
 )
 

diff --git a/crypto/awskms/signer.go b/crypto/awskms/signer.go
@@ -24,6 +24,7 @@ import (
 
 	kms "github.com/aws/aws-sdk-go-v2/service/kms"
 	"github.com/aws/aws-sdk-go-v2/service/kms/types"
+
 	"github.com/onflow/flow-go-sdk/crypto"
 	"github.com/onflow/flow-go-sdk/crypto/internal"
 )

diff --git a/crypto/cloudkms/signer.go b/crypto/cloudkms/signer.go
@@ -24,10 +24,11 @@ import (
 	"hash/crc32"
 
 	kms "cloud.google.com/go/kms/apiv1"
-	"github.com/onflow/flow-go-sdk/crypto"
-	"github.com/onflow/flow-go-sdk/crypto/internal"
 	kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
 	"google.golang.org/protobuf/types/known/wrapperspb"
+
+	"github.com/onflow/flow-go-sdk/crypto"
+	"github.com/onflow/flow-go-sdk/crypto/internal"
 )
 
 var _ crypto.Signer = (*Signer)(nil)

diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
@@ -30,6 +30,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	fgcrypto "github.com/onflow/crypto"
+
 	"github.com/onflow/flow-go-sdk/crypto"
 )
 

diff --git a/event.go b/event.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/onflow/cadence"
 	"github.com/onflow/crypto/hash"
+
 	"github.com/onflow/flow-go-sdk/crypto"
 )
 

diff --git a/examples/add_account_key/main.go b/examples/add_account_key/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/onflow/flow-go-sdk/access/http"
-
 	"github.com/onflow/flow-go-sdk"
+	"github.com/onflow/flow-go-sdk/access/http"
 	"github.com/onflow/flow-go-sdk/crypto"
 	"github.com/onflow/flow-go-sdk/examples"
 	"github.com/onflow/flow-go-sdk/templates"

diff --git a/examples/cloudkms/main.go b/examples/cloudkms/main.go
@@ -25,6 +25,7 @@ import (
 	"github.com/onflow/flow-go-sdk/access/http"
 
 	"github.com/onflow/cadence"
+
 	"github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/crypto/cloudkms"
 	"github.com/onflow/flow-go-sdk/examples"

diff --git a/examples/deploy_contract/main.go b/examples/deploy_contract/main.go
@@ -111,7 +111,6 @@ func DeployContractDemo() {
 
 	err = deployContractTx.SignEnvelope(serviceAcctAddr, serviceAcctKey.Index, serviceSigner)
 	examples.Handle(err)
-	examples.Handle(err)
 
 	err = flowClient.SendTransaction(ctx, *deployContractTx)
 	examples.Handle(err)
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ import ( @@
     	"context"
     	"github.com/onflow/cadence"
     	"github.com/onflow/flow-go-sdk"
     )
@@ Expand Down @@