From 97ab7744173228f89d91eec7ff9a5e9b8192c75d Mon Sep 17 00:00:00 2001
From: ethananony <54740729+ethananony@users.noreply.github.com>
Date: Fri, 16 Aug 2024 12:31:26 +0800
Subject: [PATCH] fix reference conflict in triple

---
 common/rpc_service.go      |  6 +++++-
 common/rpc_service_test.go | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/common/rpc_service.go b/common/rpc_service.go
index 5545523a4..1990b8ec7 100644
--- a/common/rpc_service.go
+++ b/common/rpc_service.go
@@ -52,10 +52,14 @@ type TriplePBService interface {
 }
 
 // GetReference return the reference id of the service.
-// If the service implemented the ReferencedRPCService interface,
+// If the service implemented the TriplePBService or ReferencedRPCService interface,
 // it will call the Reference method. If not, it will
 // return the struct name as the reference id.
 func GetReference(service RPCService) string {
+	if s, ok := service.(TriplePBService); ok {
+		return s.XXX_InterfaceName()
+	}
+
 	if s, ok := service.(ReferencedRPCService); ok {
 		return s.Reference()
 	}
diff --git a/common/rpc_service_test.go b/common/rpc_service_test.go
index 414666097..a5a13f94b 100644
--- a/common/rpc_service_test.go
+++ b/common/rpc_service_test.go
@@ -37,6 +37,7 @@ const (
 	testInterfaceName             = "testService"
 	testProtocol                  = "testprotocol"
 	testSuiteMethodExpectedString = "interface {}"
+	testTripleServiceName         = "com.test.TriplePath"
 )
 
 type TestService struct{}
@@ -90,6 +91,12 @@ func (s *TestService1) Reference() string {
 	return referenceTestPathDistinct
 }
 
+type TestTriplePBService struct{}
+
+func (s *TestTriplePBService) XXX_InterfaceName() string {
+	return testTripleServiceName
+}
+
 func TestServiceMapRegister(t *testing.T) {
 	// lowercase
 	s0 := &testService{}
@@ -250,4 +257,8 @@ func TestGetReference(t *testing.T) {
 	}{}
 	ref5 := GetReference(s5)
 	assert.Equal(t, expectedReference, ref5)
+
+	s6 := &TestTriplePBService{}
+	ref6 := GetReference(s6)
+	assert.Equal(t, testTripleServiceName, ref6)
 }