From 20fbb9d678e05cefb5dd714b55ffe2dd212bf1ae Mon Sep 17 00:00:00 2001 From: Trial97 Date: Thu, 26 Aug 2021 12:05:56 +0300 Subject: [PATCH] Updated libphonenumber --- go.mod | 4 ++- go.sum | 10 +++++++ utils/datanode_test.go | 66 ++++++++++++++++++------------------------ 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/go.mod b/go.mod index 1b7142bce..4b9b6492c 100644 --- a/go.mod +++ b/go.mod @@ -33,6 +33,7 @@ require ( github.com/fsnotify/fsnotify v1.4.9 github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a // indirect github.com/go-sql-driver/mysql v1.5.0 + github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.2 // indirect github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07 // indirect @@ -44,7 +45,7 @@ require ( github.com/mitchellh/mapstructure v1.4.0 github.com/nats-io/nats-server/v2 v2.2.6 // indirect github.com/nats-io/nats.go v1.11.0 - github.com/nyaruka/phonenumbers v1.0.60 + github.com/nyaruka/phonenumbers v1.0.70 github.com/peterh/liner v1.2.1 github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/rivo/uniseg v0.2.0 // indirect @@ -63,6 +64,7 @@ require ( google.golang.org/api v0.36.0 google.golang.org/genproto v0.0.0-20210111234610-22ae2b108f89 // indirect google.golang.org/grpc v1.34.1 // indirect + google.golang.org/protobuf v1.27.1 // indirect gorm.io/driver/mysql v1.0.3 gorm.io/driver/postgres v1.0.6 gorm.io/gorm v1.20.11 diff --git a/go.sum b/go.sum index df8262334..9847a7f0f 100644 --- a/go.sum +++ b/go.sum @@ -220,6 +220,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw= @@ -236,6 +239,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -407,6 +411,8 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nyaruka/phonenumbers v1.0.60 h1:nnAcNwmZflhegiImm6MkvjlRRyoaSw1ox/jGPAewWTg= github.com/nyaruka/phonenumbers v1.0.60/go.mod h1:sDaTZ/KPX5f8qyV9qN+hIm+4ZBARJrupC6LuhshJq1U= +github.com/nyaruka/phonenumbers v1.0.70 h1:AecpfeQ8/qWKzkZM2NZZEoq5B+qAuH9MUmHK397U7CQ= +github.com/nyaruka/phonenumbers v1.0.70/go.mod h1:sDaTZ/KPX5f8qyV9qN+hIm+4ZBARJrupC6LuhshJq1U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -841,6 +847,10 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= diff --git a/utils/datanode_test.go b/utils/datanode_test.go index 0ab9dd19c..13ed83e36 100644 --- a/utils/datanode_test.go +++ b/utils/datanode_test.go @@ -187,7 +187,7 @@ func TestFieldAsInterface(t *testing.T) { /// testPath = []string{"path"} dn.Map = map[string]*DataNode{ - "notPath": &DataNode{ + "notPath": { Type: 1, }, } @@ -235,7 +235,7 @@ func TestSet(t *testing.T) { dn := new(DataNode) testPath := make([]string, 0) val1 := map[string]*DataNode{ - "test": &DataNode{ + "test": { Type: 1, }, } @@ -378,17 +378,15 @@ func TestAppend2(t *testing.T) { dn.Slice = nil dn.Map = map[string]*DataNode{} dnMapExpect := map[string]*DataNode{ - "0": &DataNode{ + "0": { Type: NMMapType, Map: map[string]*DataNode{ - testPath[1]: &DataNode{ + testPath[1]: { Type: NMSliceType, - Slice: []*DataNode{ - { - Type: NMDataType, - Value: val1, - }, - }, + Slice: []*DataNode{{ + Type: NMDataType, + Value: val1, + }}, }, }, }, @@ -427,22 +425,18 @@ func TestAppend2(t *testing.T) { dn.Map = nil dn.Slice = nil testPath = []string{"0", "testPath"} - dnSliceExpect := []*DataNode{ - { - Type: NMMapType, - Map: map[string]*DataNode{ - testPath[1]: &DataNode{ - Type: NMSliceType, - Slice: []*DataNode{ - { - Type: NMDataType, - Value: val1, - }, - }, - }, + dnSliceExpect := []*DataNode{{ + Type: NMMapType, + Map: map[string]*DataNode{ + testPath[1]: { + Type: NMSliceType, + Slice: []*DataNode{{ + Type: NMDataType, + Value: val1, + }}, }, }, - } + }} if _, err := dn.Append(testPath, val1); err != nil { t.Error(err) } else if !reflect.DeepEqual(dn.Slice, dnSliceExpect) { @@ -536,22 +530,18 @@ func TestCompose2(t *testing.T) { /// dn.Slice = nil testPath = []string{"0", "testPath"} - dnSliceExpect := []*DataNode{ - { - Type: NMMapType, - Map: map[string]*DataNode{ - testPath[1]: &DataNode{ - Type: NMSliceType, - Slice: []*DataNode{ - { - Type: NMDataType, - Value: val, - }, - }, - }, + dnSliceExpect := []*DataNode{{ + Type: NMMapType, + Map: map[string]*DataNode{ + testPath[1]: { + Type: NMSliceType, + Slice: []*DataNode{{ + Type: NMDataType, + Value: val, + }}, }, }, - } + }} if err := dn.Compose(testPath, val); err != nil { t.Error(err) } else if !reflect.DeepEqual(dn.Slice, dnSliceExpect) {