Skip to content

Commit

Permalink
fix: revert proto package rename
Browse files Browse the repository at this point in the history
Signed-off-by: Pat Losoponkul <pat.losoponkul@iohk.io>
  • Loading branch information
patlo-iog committed Apr 25, 2024
1 parent 8ef258b commit 5f61f9b
Show file tree
Hide file tree
Showing 22 changed files with 55 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import org.hyperledger.identus.castor.core.model.did.{
UpdateDIDAction,
VerificationRelationship
}
import org.hyperledger.identus.protos.common_models.OperationStatus
import org.hyperledger.identus.protos.node_models.KeyUsage
import org.hyperledger.identus.protos.node_models.PublicKey.KeyData
import org.hyperledger.identus.protos.{common_models, node_api, node_models}
import io.iohk.atala.prism.protos.common_models.OperationStatus
import io.iohk.atala.prism.protos.node_models.KeyUsage
import io.iohk.atala.prism.protos.node_models.PublicKey.KeyData
import io.iohk.atala.prism.protos.{common_models, node_api, node_models}
import org.hyperledger.identus.shared.models.Base64UrlString
import org.hyperledger.identus.shared.utils.Traverse.*
import java.time.Instant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package org.hyperledger.identus.castor.core.model.did

import org.hyperledger.identus.castor.core.model.ProtoModelHelper
import io.iohk.atala.prism.crypto.{Sha256, Sha256Digest}
import org.hyperledger.identus.protos.node_models
import org.hyperledger.identus.protos.node_models.AtalaOperation.Operation
import io.iohk.atala.prism.protos.node_models
import io.iohk.atala.prism.protos.node_models.AtalaOperation.Operation
import org.hyperledger.identus.shared.models.Base64UrlString
import org.hyperledger.identus.shared.models.HexString
import scala.util.Try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.hyperledger.identus.castor.core.model.ProtoModelHelper
import io.iohk.atala.prism.crypto.Sha256

import scala.collection.compat.immutable.ArraySeq
import org.hyperledger.identus.protos.node_models
import io.iohk.atala.prism.protos.node_models

sealed trait PrismDIDOperation {
def did: CanonicalPrismDID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import org.hyperledger.identus.castor.core.model.did.{
import org.hyperledger.identus.castor.core.model.error.OperationValidationError
import org.hyperledger.identus.castor.core.model.error.{DIDOperationError, DIDResolutionError}
import org.hyperledger.identus.castor.core.util.DIDOperationValidator
import org.hyperledger.identus.protos.node_api.NodeServiceGrpc.NodeService
import org.hyperledger.identus.protos.node_models.OperationOutput.OperationMaybe
import org.hyperledger.identus.protos.{node_api, node_models}
import io.iohk.atala.prism.protos.node_api.NodeServiceGrpc.NodeService
import io.iohk.atala.prism.protos.node_models.OperationOutput.OperationMaybe
import io.iohk.atala.prism.protos.{node_api, node_models}
import org.hyperledger.identus.shared.models.HexString
import java.time.Instant
import scala.collection.immutable.ArraySeq
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import org.hyperledger.identus.castor.core.model.did.ServiceEndpoint.UriOrJsonEn
import org.hyperledger.identus.castor.core.model.did.ServiceEndpoint.UriValue
import org.hyperledger.identus.castor.core.model.did.ServiceType
import org.hyperledger.identus.castor.core.util.GenUtils
import org.hyperledger.identus.protos.common_models.Ledger
import org.hyperledger.identus.protos.node_models
import io.iohk.atala.prism.protos.common_models.Ledger
import io.iohk.atala.prism.protos.node_models
import java.time.Instant
import scala.language.implicitConversions
import zio.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.hyperledger.identus.castor.core.model.did

import com.google.protobuf.ByteString
import io.iohk.atala.prism.crypto.{Sha256, Sha256Digest}
import org.hyperledger.identus.protos.node_models
import io.iohk.atala.prism.protos.node_models
import org.hyperledger.identus.shared.models.Base64UrlString
import zio.*
import zio.test.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import org.hyperledger.identus.castor.core.model.did.{DIDData, PrismDID, PrismDI
import org.hyperledger.identus.castor.core.model.error.DIDResolutionError
import org.hyperledger.identus.castor.core.util.{GenUtils}
import org.hyperledger.identus.castor.core.util.DIDOperationValidator
import org.hyperledger.identus.protos.common_models.{HealthCheckRequest, HealthCheckResponse}
import org.hyperledger.identus.protos.node_api
import org.hyperledger.identus.protos.node_models
import org.hyperledger.identus.protos.node_api.{
import io.iohk.atala.prism.protos.common_models.{HealthCheckRequest, HealthCheckResponse}
import io.iohk.atala.prism.protos.node_api
import io.iohk.atala.prism.protos.node_models
import io.iohk.atala.prism.protos.node_api.{
GetBatchStateRequest,
GetBatchStateResponse,
GetCredentialRevocationTimeRequest,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import org.hyperledger.identus.iam.authentication.oidc.KeycloakEntity
import org.hyperledger.identus.iam.authorization.core.PermissionManagement
import org.hyperledger.identus.iam.authorization.keycloak.admin.KeycloakPermissionManagementService
import org.hyperledger.identus.pollux.vc.jwt.{PrismDidResolver, DidResolver as JwtDidResolver}
import org.hyperledger.identus.protos.node_api.NodeServiceGrpc
import io.iohk.atala.prism.protos.node_api.NodeServiceGrpc
import org.hyperledger.identus.shared.crypto.Apollo
import org.hyperledger.identus.shared.db.{ContextAwareTask, DbConfig, TransactorLayer}
import org.keycloak.authorization.client.AuthzClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import org.hyperledger.identus.castor.core.model.did.InternalKeyPurpose
import org.hyperledger.identus.castor.core.model.did.VerificationRelationship
import org.hyperledger.identus.castor.core.model.did.{PrismDID, PrismDIDOperation, ScheduledDIDOperationStatus}
import org.hyperledger.identus.event.notification.EventNotificationConfig
import org.hyperledger.identus.protos.node_models
import io.iohk.atala.prism.protos.node_models
import org.hyperledger.identus.shared.crypto.jwk.JWK
import org.hyperledger.identus.shared.models.WalletId
import zio.json.*
Expand Down
4 changes: 2 additions & 2 deletions prism-node/client/scala-client/api/grpc/common_models.proto
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
syntax = "proto3";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

import "google/protobuf/timestamp.proto";

Expand Down
24 changes: 12 additions & 12 deletions prism-node/client/scala-client/api/grpc/connector_api.proto
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
syntax = "proto3";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

import "common_models.proto";
import "connector_models.proto";
import "node_models.proto";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

/**
* The Connector API.
Expand Down Expand Up @@ -213,7 +213,7 @@ message GetConnectionByTokenRequest {
}
// The response while finding a connection by token.
message GetConnectionByTokenResponse {
org.hyperledger.identus.protos.Connection connection = 1;
io.iohk.atala.prism.protos.Connection connection = 1;
}

// Finds a connection by the given id.
Expand All @@ -222,7 +222,7 @@ message GetConnectionByIdRequest {
}
// The response while finding a connection by id.
message GetConnectionByIdResponse {
org.hyperledger.identus.protos.ConnectionInfo connection = 1;
io.iohk.atala.prism.protos.ConnectionInfo connection = 1;
}

// Requests connections instantiated by/with us, possibly after a known connection.
Expand All @@ -235,7 +235,7 @@ message GetConnectionsPaginatedRequest {

// Result with instantiated connections.
message GetConnectionsPaginatedResponse {
repeated org.hyperledger.identus.protos.ConnectionInfo connections = 1; // Connections sorted in ascending order by instantiation time.
repeated io.iohk.atala.prism.protos.ConnectionInfo connections = 1; // Connections sorted in ascending order by instantiation time.
}

// Request to obtain information of connection token.
Expand Down Expand Up @@ -263,12 +263,12 @@ message AddConnectionFromTokenRequest {
reserved "paymentNonce";

string token = 1; // A token to instantiate a connection.
org.hyperledger.identus.protos.EncodedPublicKey holder_encoded_public_key = 4; // Uncompressed encoded public key.
io.iohk.atala.prism.protos.EncodedPublicKey holder_encoded_public_key = 4; // Uncompressed encoded public key.
}

// Confirmation of connection instantiation.
message AddConnectionFromTokenResponse {
org.hyperledger.identus.protos.ConnectionInfo connection = 1; // Instantiated connection information.
io.iohk.atala.prism.protos.ConnectionInfo connection = 1; // Instantiated connection information.
}

// Request to revoke a connection.
Expand Down Expand Up @@ -299,7 +299,7 @@ message GetMessagesPaginatedRequest {

// Response with messages.
message GetMessagesPaginatedResponse {
repeated org.hyperledger.identus.protos.ReceivedMessage messages = 1; // Messages sorted by reception time in ascending order.
repeated io.iohk.atala.prism.protos.ReceivedMessage messages = 1; // Messages sorted by reception time in ascending order.
}

// Request to stream new messages, which starts the stream from messages received after the given lastSeenMessageId
Expand All @@ -310,7 +310,7 @@ message GetMessageStreamRequest {

// Response for the new messages stream.
message GetMessageStreamResponse {
org.hyperledger.identus.protos.ReceivedMessage message = 1; // The received message.
io.iohk.atala.prism.protos.ReceivedMessage message = 1; // The received message.
}

// Finds available messages from the given connection.
Expand All @@ -319,7 +319,7 @@ message GetMessagesForConnectionRequest {
string connection_id = 1;
}
message GetMessagesForConnectionResponse {
repeated org.hyperledger.identus.protos.ReceivedMessage messages = 1;
repeated io.iohk.atala.prism.protos.ReceivedMessage messages = 1;
}

// Finds the available keys to send end-to-end encrypted messages.
Expand All @@ -330,7 +330,7 @@ message GetConnectionCommunicationKeysRequest {
message GetConnectionCommunicationKeysResponse {
// Keys that can be used for communication with the other end of connection with their IDs.
// keyId inside might be empty if there is just one key in the collection.
repeated org.hyperledger.identus.protos.ConnectionKey keys = 1;
repeated io.iohk.atala.prism.protos.ConnectionKey keys = 1;
}

// Request to send message.
Expand Down Expand Up @@ -365,7 +365,7 @@ message SendMessagesResponse {
message RegisterDIDRequest {
oneof register_with {
// The necessary operation to publish the DID to the blockchain.
org.hyperledger.identus.protos.SignedAtalaOperation create_did_operation = 1;
io.iohk.atala.prism.protos.SignedAtalaOperation create_did_operation = 1;
// The already published DID.
string existing_did = 5;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
syntax = "proto3";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

import "console_models.proto";
import "credential_models.proto";
import "google/protobuf/timestamp.proto";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

// @exclude GENERAL

Expand Down
4 changes: 2 additions & 2 deletions prism-node/client/scala-client/api/grpc/console_api.proto
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
syntax = "proto3";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

import "console_models.proto";
import "common_models.proto";
Expand Down
4 changes: 2 additions & 2 deletions prism-node/client/scala-client/api/grpc/console_models.proto
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
syntax = "proto3";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

import "common_models.proto";
import "google/protobuf/timestamp.proto";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
syntax = "proto3";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

import "common_models.proto";
import "status.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/any.proto";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;


message ProofRequest {
Expand Down
4 changes: 2 additions & 2 deletions prism-node/client/scala-client/api/grpc/cviews_api.proto
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
syntax = "proto3";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

import "cviews_models.proto";

Expand Down
4 changes: 2 additions & 2 deletions prism-node/client/scala-client/api/grpc/cviews_models.proto
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
syntax = "proto3";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

// Represents a credential template.
message CredentialViewTemplate {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ syntax = "proto3";

import "intdemo/intdemo_models.proto";

package org.hyperledger.identus.prism.intdemo.protos;
package io.iohk.atala.prism.intdemo.protos;

// This service simulates an application run by a government body who use org.hyperledger.identus's connector.
// This service simulates an application run by a government body who use io.iohk.atala's connector.
service IDService {
rpc GetConnectionToken (GetConnectionTokenRequest) returns (GetConnectionTokenResponse) {}
rpc GetSubjectStatus (GetSubjectStatusRequest) returns (GetSubjectStatusResponse) {}
rpc GetSubjectStatusStream (GetSubjectStatusRequest) returns (stream GetSubjectStatusResponse) {}
rpc SetPersonalData (SetPersonalDataRequest) returns (SetPersonalDataResponse) {}
}

// This service simulates an application run by a university who use org.hyperledger.identus's connector.
// This service simulates an application run by a university who use io.iohk.atala's connector.
service DegreeService {
rpc GetConnectionToken (GetConnectionTokenRequest) returns (GetConnectionTokenResponse) {}
rpc GetSubjectStatus (GetSubjectStatusRequest) returns (GetSubjectStatusResponse) {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
syntax = "proto3";

package org.hyperledger.identus.prism.intdemo.protos;
package io.iohk.atala.prism.intdemo.protos;

message Date {
int32 year = 1; // positive value
Expand Down
4 changes: 2 additions & 2 deletions prism-node/client/scala-client/api/grpc/node_api.proto
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
syntax = "proto3";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

import "common_models.proto";
import "node_models.proto";
Expand Down
4 changes: 2 additions & 2 deletions prism-node/client/scala-client/api/grpc/node_internal.proto
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
syntax = "proto3";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

import "node_models.proto";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

/**
* Represent a block that holds operations.
Expand Down
4 changes: 2 additions & 2 deletions prism-node/client/scala-client/api/grpc/node_models.proto
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
syntax = "proto3";

package org.hyperledger.identus.protos;
package io.iohk.atala.prism.protos;

import "common_models.proto";
import "google/protobuf/timestamp.proto";

option java_multiple_files = true;
option java_package = "org.hyperledger.identus.protos";
option java_package = "io.iohk.atala.prism.protos";

// Includes timestamping details about a blockchain's block.
message TimestampInfo {
Expand Down

0 comments on commit 5f61f9b

Please sign in to comment.