mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Another incremental renaming refactor for s&f

Browse source
This commit is contained in:
Devon Hudson 2023-01-11 16:42:55 -07:00
parent ed71fe63ae
commit 40563741da
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
7 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/gobind-pinecone/monolith.go
View file

@ -517,9 +517,9 @@ type RelayServerRetriever struct {
}
func (m *RelayServerRetriever) InitializeRelayServers(eLog *logrus.Entry) {
request := api.QueryRelayServersRequest{Server: gomatrixserverlib.ServerName(m.ServerName)}
response := api.QueryRelayServersResponse{}
err := m.FederationAPI.QueryRelayServers(m.Context, &request, &response)
request := api.P2PQueryRelayServersRequest{Server: gomatrixserverlib.ServerName(m.ServerName)}
response := api.P2PQueryRelayServersResponse{}
err := m.FederationAPI.P2PQueryRelayServers(m.Context, &request, &response)
if err != nil {
eLog.Warnf("Failed obtaining list of this node's relay servers: %s", err.Error())
}

2
build/gobind-pinecone/monolith_test.go
View file

@ -133,7 +133,7 @@ type FakeFedAPI struct {
api.FederationInternalAPI
}
func (f *FakeFedAPI) QueryRelayServers(ctx context.Context, req *api.QueryRelayServersRequest, res *api.QueryRelayServersResponse) error {
func (f *FakeFedAPI) P2PQueryRelayServers(ctx context.Context, req *api.P2PQueryRelayServersRequest, res *api.P2PQueryRelayServersResponse) error {
res.RelayServers = testRelayServers
return nil
}

6
cmd/dendrite-demo-pinecone/main.go
View file

@ -377,9 +377,9 @@ type RelayServerRetriever struct {
}
func (m *RelayServerRetriever) InitializeRelayServers(eLog *logrus.Entry) {
request := api.QueryRelayServersRequest{Server: gomatrixserverlib.ServerName(m.ServerName)}
response := api.QueryRelayServersResponse{}
err := m.FederationAPI.QueryRelayServers(m.Context, &request, &response)
request := api.P2PQueryRelayServersRequest{Server: gomatrixserverlib.ServerName(m.ServerName)}
response := api.P2PQueryRelayServersResponse{}
err := m.FederationAPI.P2PQueryRelayServers(m.Context, &request, &response)
if err != nil {
eLog.Warnf("Failed obtaining list of this node's relay servers: %s", err.Error())
}

24
federationapi/api/api.go
View file

@ -37,10 +37,10 @@ type FederationInternalAPI interface {
) error
// Relay Server sync api used in the pinecone demos.
QueryRelayServers(
P2PQueryRelayServers(
ctx context.Context,
request *QueryRelayServersRequest,
response *QueryRelayServersResponse,
request *P2PQueryRelayServersRequest,
response *P2PQueryRelayServersResponse,
) error
}
@ -243,27 +243,27 @@ type InputPublicKeysRequest struct {
type InputPublicKeysResponse struct {
}
type QueryRelayServersRequest struct {
type P2PQueryRelayServersRequest struct {
Server gomatrixserverlib.ServerName
}
type QueryRelayServersResponse struct {
type P2PQueryRelayServersResponse struct {
RelayServers []gomatrixserverlib.ServerName
}
type PerformStoreAsyncRequest struct {
Txn gomatrixserverlib.Transaction `json:"transaction"`
UserID gomatrixserverlib.UserID `json:"user_id"`
type P2PPerformStoreAsyncRequest struct {
Transaction gomatrixserverlib.Transaction `json:"transaction"`
UserID gomatrixserverlib.UserID `json:"user_id"`
}
type PerformStoreAsyncResponse struct {
type P2PPerformStoreAsyncResponse struct {
}
type QueryAsyncTransactionsRequest struct {
type P2PQueryAsyncTransactionsRequest struct {
UserID gomatrixserverlib.UserID `json:"user_id"`
}
type QueryAsyncTransactionsResponse struct {
Txn gomatrixserverlib.Transaction `json:"transaction"`
type P2PQueryAsyncTransactionsResponse struct {
Transaction gomatrixserverlib.Transaction `json:"transaction"`
RemainingCount uint32 `json:"remaining"`
}

8
federationapi/internal/perform.go
View file

@ -831,11 +831,11 @@ func federatedAuthProvider(
}
}
// QueryRelayServers implements api.FederationInternalAPI
func (r *FederationInternalAPI) QueryRelayServers(
// P2PQueryRelayServers implements api.FederationInternalAPI
func (r *FederationInternalAPI) P2PQueryRelayServers(
ctx context.Context,
request *api.QueryRelayServersRequest,
response *api.QueryRelayServersResponse,
request *api.P2PQueryRelayServersRequest,
response *api.P2PQueryRelayServersResponse,
) error {
logrus.Infof("Getting relay servers for: %s", request.Server)
relayServers, err := r.db.GetRelayServersForServer(request.Server)

6
federationapi/internal/perform_test.go
View file

@ -113,11 +113,11 @@ func TestQueryRelayServers(t *testing.T) {
testDB, &cfg, nil, fedClient, &stats, nil, queues, nil,
)
req := api.QueryRelayServersRequest{
req := api.P2PQueryRelayServersRequest{
Server: server,
}
res := api.QueryRelayServersResponse{}
err = fedAPI.QueryRelayServers(context.Background(), &req, &res)
res := api.P2PQueryRelayServersResponse{}
err = fedAPI.P2PQueryRelayServers(context.Background(), &req, &res)
assert.NoError(t, err)
assert.Equal(t, len(relayServers), len(res.RelayServers))

6
federationapi/inthttp/client.go
View file

@ -512,10 +512,10 @@ func (h *httpFederationInternalAPI) QueryPublicKeys(
)
}
func (h *httpFederationInternalAPI) QueryRelayServers(
func (h *httpFederationInternalAPI) P2PQueryRelayServers(
ctx context.Context,
request *api.QueryRelayServersRequest,
response *api.QueryRelayServersResponse,
request *api.P2PQueryRelayServersRequest,
response *api.P2PQueryRelayServersResponse,
) error {
return httputil.CallInternalRPCAPI(
"QueryRelayServers", h.federationAPIURL+FederationAPIQueryRelayServers,