From cd7a8cbc57af82c9957a7aeb15cd76ef8820807a Mon Sep 17 00:00:00 2001
From: "Zheng, Qi" <huaiqing.zq@antgroup.com>
Date: Wed, 11 Oct 2023 14:55:18 +0800
Subject: [PATCH]  [demos] Specify grpc_pingpong package version for go 1.18

---
 demos/golang/grpc_pingpong/go.mod               | 15 +++++++++++----
 demos/golang/grpc_pingpong/prepare_ping_pong.sh |  2 --
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/demos/golang/grpc_pingpong/go.mod b/demos/golang/grpc_pingpong/go.mod
index 2b10f957..140d79e7 100644
--- a/demos/golang/grpc_pingpong/go.mod
+++ b/demos/golang/grpc_pingpong/go.mod
@@ -1,9 +1,16 @@
 module grpc_pingpong
 
-go 1.13
+go 1.18
 
 require (
-	golang.org/x/net v0.0.0-20190311183353-d8887717615a
-	google.golang.org/grpc v1.34.0-dev
-	google.golang.org/protobuf v1.25.0 // indirect
+	golang.org/x/net v0.17.0
+	google.golang.org/grpc v1.58.2
+)
+
+require (
+	github.com/golang/protobuf v1.5.3 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 )
diff --git a/demos/golang/grpc_pingpong/prepare_ping_pong.sh b/demos/golang/grpc_pingpong/prepare_ping_pong.sh
index 4b25c285..ad24d093 100755
--- a/demos/golang/grpc_pingpong/prepare_ping_pong.sh
+++ b/demos/golang/grpc_pingpong/prepare_ping_pong.sh
@@ -31,8 +31,6 @@ done
 GOVERSION=`occlum-go version|awk -F ' ' '{printf $3}'`
 export GO111MODULE=on
 if [[ $GOVERSION != 'go1.16.3' ]];then
-	rm -f go.mod
-	occlum-go mod init grpc_pingpong
 	occlum-go mod tidy
 fi
 # update PATH so that the protoc compiler can find the plugin: