Rename RpcMessage::toToRpcFrame() to RpcMessage::toRpcFrame()

silicon-heaven · Nov 5, 2024 · 093233c · 093233c
1 parent 2ceb06d
commit 093233c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/libshvchainpack/include/shv/chainpack/rpcmessage.h b/libshvchainpack/include/shv/chainpack/rpcmessage.h
@@ -147,7 +147,7 @@ class SHVCHAINPACK_DECL_EXPORT RpcMessage
 	std::string toCpon() const;
 	std::string toChainPack() const;
 
-	RpcFrame toToRpcFrame(Rpc::ProtocolType protocol = Rpc::ProtocolType::ChainPack) const;
+	RpcFrame toRpcFrame(Rpc::ProtocolType protocol = Rpc::ProtocolType::ChainPack) const;
 
 	const RpcValue::MetaData& metaData() const;
 	RpcValue metaValue(RpcValue::Int key) const;

diff --git a/libshvchainpack/src/rpcdriver.cpp b/libshvchainpack/src/rpcdriver.cpp
@@ -27,7 +27,7 @@ RpcDriver::~RpcDriver() = default;
 
 void RpcDriver::sendRpcMessage(const RpcMessage &msg)
 {
-	RpcDriver::sendRpcFrame(msg.toToRpcFrame(m_clientProtocolType));
+	RpcDriver::sendRpcFrame(msg.toRpcFrame(m_clientProtocolType));
 }
 
 void RpcDriver::sendRpcFrame(RpcFrame &&frame)
@@ -46,7 +46,7 @@ void RpcDriver::sendRpcFrame(RpcFrame &&frame)
 			if (!errmsg.empty()) {
 				throw std::runtime_error("Cannot convert RPC frame to message: " + errmsg);
 			}
-			frame = msg.toToRpcFrame(m_clientProtocolType);
+			frame = msg.toRpcFrame(m_clientProtocolType);
 		}
 		auto frame_data = frame.toFrameData();
 		//logRpcData().nospace() << "FRAME DATA WRITE " << frame_data.size() << " bytes of data:\n" << shv::chainpack::utils::hexDump(frame_data);

diff --git a/libshvchainpack/src/rpcmessage.cpp b/libshvchainpack/src/rpcmessage.cpp
@@ -637,7 +637,7 @@ std::string RpcMessage::toChainPack() const
 	return m_value.toChainPack();
 }
 
-RpcFrame RpcMessage::toToRpcFrame(Rpc::ProtocolType protocol) const
+RpcFrame RpcMessage::toRpcFrame(Rpc::ProtocolType protocol) const
 {
 	auto val = m_value;
 	auto meta = val.takeMeta();

diff --git a/libshviotqt/tests/test_frame_reader.cpp b/libshviotqt/tests/test_frame_reader.cpp
@@ -36,7 +36,7 @@ vector<string> msg_to_raw_data(const vector<string> &cpons)
 		auto rv = RpcValue::fromCpon(cpon);
 		auto msg = RpcMessage(rv);
 		StreamFrameWriter wr;
-		wr.addFrame(msg.toToRpcFrame().toFrameData());
+		wr.addFrame(msg.toRpcFrame().toFrameData());
 		QByteArray ba;
 		{
 			QBuffer buffer(&ba);
@@ -54,7 +54,7 @@ vector<string> msg_to_raw_data_serial(const vector<string> &cpons, SerialFrameWr
 		auto rv = RpcValue::fromCpon(cpon);
 		auto msg = RpcMessage(rv);
 		SerialFrameWriter wr(crc_check);
-		wr.addFrame(msg.toToRpcFrame().toFrameData());
+		wr.addFrame(msg.toRpcFrame().toFrameData());
 		QByteArray ba;
 		{
 			QBuffer buffer(&ba);