TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Collapse success&failure callbacks into one

Browse Source 
Instead of two callbacks:
- void on_success(Result result)
- void on_failure(Status status)
use just one callback:
void on_result(StatusOr<Result> result)

PiperOrigin-RevId: 501912034
This commit is contained in:
Janusz Sobczak
2023-01-13 12:28:47 -08:00
committed by Copybara-Service
parent 454d22b19a
commit 0e2111afc2
10 changed files with 132 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/credential_callbacks.h
+8 -6
View File
@@ -22,6 +22,7 @@
#include "absl/functional/any_invocable.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
#include "internal/proto/credential.pb.h"
@@ -53,8 +54,9 @@ struct SaveCredentialsResultCallback {
absl::AnyInvocable<void(absl::Status)> credentials_saved_cb;
};
struct GenerateCredentialsCallback {
absl::AnyInvocable<void(std::vector<nearby::internal::PublicCredential>)>
struct GenerateCredentialsResultCallback {
absl::AnyInvocable<void(
absl::StatusOr<std::vector<nearby::internal::PublicCredential>>)>
credentials_generated_cb;
};
@@ -63,15 +65,15 @@ struct UpdateRemotePublicCredentialsCallback {
};
struct GetPrivateCredentialsResultCallback {
absl::AnyInvocable<void(std::vector<::nearby::internal::PrivateCredential>)>
absl::AnyInvocable<void(
absl::StatusOr<std::vector<nearby::internal::PrivateCredential>>)>
credentials_fetched_cb;
absl::AnyInvocable<void(absl::Status)> get_credentials_failed_cb;
};
struct GetPublicCredentialsResultCallback {
absl::AnyInvocable<void(std::vector<::nearby::internal::PublicCredential>)>
absl::AnyInvocable<void(
absl::StatusOr<std::vector<nearby::internal::PublicCredential>>)>
credentials_fetched_cb;
absl::AnyInvocable<void(absl::Status)> get_credentials_failed_cb;
};
inline std::ostream& operator<<(std::ostream& os,
internal/platform/implementation/g3/credential_storage_impl.cc
+4 -4
View File
@@ -113,7 +113,7 @@ void CredentialStorageImpl::GetPrivateCredentials(
if (private_credentials_map_.find(key) == private_credentials_map_.end()) {
NEARBY_LOGS(WARNING) << "There are no Private Credentials stored for key:"
<< std::get<0>(key) << ", " << std::get<1>(key);
std::move(callback.get_credentials_failed_cb)(absl::NotFoundError(
std::move(callback.credentials_fetched_cb)(absl::NotFoundError(
absl::StrFormat("No private credentials for %v", credential_selector)));
return;
}
@@ -121,7 +121,7 @@ void CredentialStorageImpl::GetPrivateCredentials(
private_credentials_map_[key];
FilterIdentityType(private_credentials, credential_selector.identity_type);
if (private_credentials.empty()) {
std::move(callback.get_credentials_failed_cb)(absl::NotFoundError(
std::move(callback.credentials_fetched_cb)(absl::NotFoundError(
absl::StrFormat("No private credentials for %v", credential_selector)));
return;
}
@@ -141,7 +141,7 @@ void CredentialStorageImpl::GetPublicCredentials(
NEARBY_LOGS(WARNING) << "There are no Public Credentials stored for key:"
<< std::get<0>(key) << ", " << std::get<1>(key) << ", "
<< std::get<2>(key);
std::move(callback.get_credentials_failed_cb)(absl::NotFoundError(
std::move(callback.credentials_fetched_cb)(absl::NotFoundError(
absl::StrFormat("No public credentials for %v", credential_selector)));
return;
}
@@ -149,7 +149,7 @@ void CredentialStorageImpl::GetPublicCredentials(
public_credentials_map_[key];
FilterIdentityType(public_credentials, credential_selector.identity_type);
if (public_credentials.empty()) {
std::move(callback.get_credentials_failed_cb)(absl::NotFoundError(
std::move(callback.credentials_fetched_cb)(absl::NotFoundError(
absl::StrFormat("No public credentials for %v", credential_selector)));
return;
}