fix: fix test in protoc async

because of the api change
1. fix the marco in prost
2. fix the test

Signed-off-by: jokemanfire <hu.dingyang@zte.com.cn>

Author: jokemanfire

.github/workflows/bvt.yml

@@ -11,8 +11,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install Protoc
-        run: |
-          ./install_protoc.sh
+        run: ./install_protoc.sh
+        shell: bash
       - name: Check
         run: |
           make deps
@@ -31,8 +31,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install Protoc
-        run: |
-          ./install_protoc.sh
+        run: ./install_protoc.sh
+        shell: bash
       - name: Build
         run: |
           make

.gitignore

@@ -10,4 +10,5 @@ example/protocols/**/*.rs
 example2/protocols/**/*.rs
 !example2/protocols/**/mod.rs
 src/ttrpc.rs
-example2/protocols/**/*.rs
+example2/protocols/**/*.rs
+!example2/protocols/**/mod.rs

Makefile

@@ -24,8 +24,7 @@ build: debug
 .PHONY: test
 test:
 ifeq ($OS,Windows_NT)
-	# async isn't enabled for windows, don't test that feature
-	cargo test --verbose
+	cargo test --features sync,async,rustprotobuf
 else
 	# cargo test --all-features --verbose
 	cargo test --features sync,async,rustprotobuf
@@ -36,11 +35,15 @@ endif
 check:
 	cargo fmt --all -- --check
 	cargo clippy --all-targets --features sync,async -- -D warnings
+	# Skip prost check on Windows
+ifeq ($(OS),Windows_NT)
+	@echo "Skipping prost check on Windows"
+else
 	cargo clippy --all-targets --no-default-features --features sync,async,prost -- -D warnings
+endif
 
-.PHONY: deps
-deps:
-	rustup update stable
-	rustup default stable
-	rustup component add rustfmt clippy
-	./install_protoc.sh
+.PHONY: check-all
+check-all:
+	$(MAKE) check
+	$(MAKE) -C compiler check
+	$(MAKE) -C ttrpc-codegen check

example/Cargo.toml

@@ -13,7 +13,7 @@ description = "An example of ttrpc."
 [dev-dependencies]
 protobuf = "3.1.0"
 bytes = "0.4.11"
-libc = "0.2.79"
+libc = "0.2.158"
 byteorder = "1.3.2"
 log = "0.4.6"
 simple-logging = "2.0.2"

example2/async_client.rs

@@ -12,7 +12,7 @@ use ttrpc::r#async::Client;
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() {
-    let c = Client::connect(utils::SOCK_ADDR).unwrap();
+    let c = Client::connect(utils::SOCK_ADDR).await.unwrap();
     let hc = health::HealthClient::new(c.clone());
     let ac = agent::AgentServiceClient::new(c);
 

example2/async_stream_client.rs

@@ -14,7 +14,7 @@ use ttrpc::r#async::Client;
 async fn main() {
     simple_logging::log_to_stderr(log::LevelFilter::Info);
 
-    let c = Client::connect(utils::SOCK_ADDR).unwrap();
+    let c = Client::connect(utils::SOCK_ADDR).await.unwrap();
     let sc = streaming::StreamingClient::new(c);
 
     let _now = std::time::Instant::now();

example2/protocols/asynchronous/mod.rs

@@ -0,0 +1,8 @@
+// Copyright (c) 2020 Ant Financial
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#![allow(dead_code)]
+
+include!("_include.rs");

example2/protocols/sync/mod.rs

@@ -0,0 +1,8 @@
+// Copyright (c) 2020 Ant Financial
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#![allow(dead_code)]
+
+include!("_include.rs");

src/asynchronous/utils.rs

@@ -434,7 +434,7 @@ macro_rules! async_client_stream_receive {
             .map_err(::ttrpc::err_to_others!(e, "Encoding error "))?;
 
         let inner = $self.client.new_stream(creq, false, true).await?;
-        let stream = ::ttrpc::r#async::ClientStreamReceiver::new(inner);
+        let stream = ::ttrpc::r#async::ClientStreamReceiver::new(inner, $self.client.clone());
 
         return Ok(stream);
     };