resolve conflict
All checks were successful
lint / lint (pull_request) Successful in 1m13s
test / test (pull_request) Successful in 2m2s

This commit is contained in:
2025-03-03 09:44:35 +03:00
parent 7ad92816ef
commit 36c52990ee
5 changed files with 12 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
"go.unistack.org/micro/v3/codec" "go.unistack.org/micro/v4/codec"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
) )

View File

@@ -2,9 +2,10 @@ package grpc
import ( import (
"context" "context"
"go.unistack.org/micro/v3/codec"
gmetadata "google.golang.org/grpc/metadata"
"testing" "testing"
"go.unistack.org/micro/v4/codec"
gmetadata "google.golang.org/grpc/metadata"
) )
type mockStream struct { type mockStream struct {

2
go.mod
View File

@@ -2,6 +2,8 @@ module go.unistack.org/micro-client-grpc/v4
go 1.23.0 go 1.23.0
toolchain go1.23.3
require ( require (
go.unistack.org/micro/v4 v4.1.2 go.unistack.org/micro/v4 v4.1.2
google.golang.org/grpc v1.70.0 google.golang.org/grpc v1.70.0

10
grpc.go
View File

@@ -5,11 +5,6 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"go.unistack.org/micro/v4/options"
"go.unistack.org/micro/v4/semconv"
"go.unistack.org/micro/v4/tracer"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"net" "net"
"reflect" "reflect"
"strconv" "strconv"
@@ -21,12 +16,17 @@ import (
"go.unistack.org/micro/v4/codec" "go.unistack.org/micro/v4/codec"
"go.unistack.org/micro/v4/errors" "go.unistack.org/micro/v4/errors"
"go.unistack.org/micro/v4/metadata" "go.unistack.org/micro/v4/metadata"
"go.unistack.org/micro/v4/options"
"go.unistack.org/micro/v4/selector" "go.unistack.org/micro/v4/selector"
"go.unistack.org/micro/v4/semconv"
"go.unistack.org/micro/v4/tracer"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
gmetadata "google.golang.org/grpc/metadata" gmetadata "google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
) )
const ( const (

View File

@@ -6,6 +6,7 @@ import (
"sync" "sync"
"go.unistack.org/micro/v4/client" "go.unistack.org/micro/v4/client"
"go.unistack.org/micro/v4/tracer"
"google.golang.org/grpc" "google.golang.org/grpc"
) )