Skip to content

Commit

Permalink
Merge branch 'master' into chore/shardinfo-terminology-rfc
Browse files Browse the repository at this point in the history
  • Loading branch information
danisharora099 authored Nov 29, 2023
2 parents f7bfe4f + 7ce642c commit 5d9c116
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions packages/core/src/lib/message/version_0.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export function createEncoder({
return new Encoder(
contentTopic,
ephemeral,
pubsubTopicShardInfo?.clusterId
pubsubTopicShardInfo
? singleShardInfoToPubsubTopic(pubsubTopicShardInfo)
: DefaultPubsubTopic,
metaSetter
Expand Down Expand Up @@ -193,7 +193,7 @@ export function createDecoder(
pubsubTopicShardInfo?: SingleShardInfo
): Decoder {
return new Decoder(
pubsubTopicShardInfo?.clusterId
pubsubTopicShardInfo
? singleShardInfoToPubsubTopic(pubsubTopicShardInfo)
: DefaultPubsubTopic,
contentTopic
Expand Down
4 changes: 2 additions & 2 deletions packages/message-encryption/src/ecies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export function createEncoder({
metaSetter
}: EncoderOptions): Encoder {
return new Encoder(
pubsubTopicShardInfo?.clusterId
pubsubTopicShardInfo
? singleShardInfoToPubsubTopic(pubsubTopicShardInfo)
: DefaultPubsubTopic,
contentTopic,
Expand Down Expand Up @@ -200,7 +200,7 @@ export function createDecoder(
pubsubTopicShardInfo?: SingleShardInfo
): Decoder {
return new Decoder(
pubsubTopicShardInfo?.clusterId
pubsubTopicShardInfo
? singleShardInfoToPubsubTopic(pubsubTopicShardInfo)
: DefaultPubsubTopic,
contentTopic,
Expand Down
4 changes: 2 additions & 2 deletions packages/message-encryption/src/symmetric.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export function createEncoder({
metaSetter
}: EncoderOptions): Encoder {
return new Encoder(
pubsubTopicShardInfo?.clusterId
pubsubTopicShardInfo
? singleShardInfoToPubsubTopic(pubsubTopicShardInfo)
: DefaultPubsubTopic,
contentTopic,
Expand Down Expand Up @@ -200,7 +200,7 @@ export function createDecoder(
pubsubTopicShardInfo?: SingleShardInfo
): Decoder {
return new Decoder(
pubsubTopicShardInfo?.clusterId
pubsubTopicShardInfo
? singleShardInfoToPubsubTopic(pubsubTopicShardInfo)
: DefaultPubsubTopic,
contentTopic,
Expand Down

0 comments on commit 5d9c116

Please sign in to comment.