Skip to content

Commit e18d8da

Browse files
HarshSawarkarHarshSawarkar
committed
Resolved Conflicts.
Signed-off-by: Harsh Sawarkar <[email protected]>
2 parents da27095 + 0a49715 commit e18d8da

File tree

319 files changed

+1781
-1469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+1781
-1469
lines changed

‎.github/workflows/pr-formatting.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
22
name: "PR Formatting Checks"
33
on:
4-
pull_request:
4+
pull_request_target:
55
types:
66
- assigned
77
- unassigned

‎charts/block-node-server/templates/deployment.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,24 @@ spec:
4141
claimName: {{ if .Values.blockNode.persistence.live.create }}{{ include "hiero-block-node.fullname" . }}-live{{ else }}{{ .Values.blockNode.persistence.live.existingClaim }}{{ end }}
4242
- name: unverified-ephemeral-storage
4343
emptyDir: {}
44+
initContainers:
45+
- name: init-storage-dirs
46+
image: busybox
47+
command:
48+
- sh
49+
- -c
50+
- |
51+
mkdir -p /live-pvc/live-data && \
52+
chown 2000:2000 /live-pvc/live-data && \
53+
chmod 700 /live-pvc/live-data && \
54+
mkdir -p /archive-pvc/archive-data && \
55+
chown 2000:2000 /archive-pvc/archive-data && \
56+
chmod 700 /archive-pvc/archive-data
57+
volumeMounts:
58+
- name: live-storage
59+
mountPath: /live-pvc
60+
- name: archive-storage
61+
mountPath: /archive-pvc
4462
containers:
4563
- name: {{ .Chart.Name }}
4664
securityContext:
@@ -65,8 +83,10 @@ spec:
6583
readOnly: true
6684
- name: archive-storage
6785
mountPath: {{ .Values.blockNode.persistence.archive.mountPath }}
86+
subPath: archive-data
6887
- name: live-storage
6988
mountPath: {{ .Values.blockNode.persistence.live.mountPath }}
89+
subPath: live-data
7090
- name: unverified-ephemeral-storage
7191
mountPath: {{ .Values.blockNode.persistence.unverified.mountPath }}
7292
{{- with .Values.resources }}

‎codecov.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ coverage:
1919
threshold: 1%
2020

2121
ignore:
22-
- "server/src/main/java/com/hedera/block/server/Server.java"
23-
- "server/src/main/java/com/hedera/block/server/mediator/NoOpLiveStreamMediator.java"
24-
- "server/src/main/java/com/hedera/block/server/producer/NoOpProducerObserver.java"
25-
- "server/src/main/java/com/hedera/block/server/persistence/storage/write/NoOpBlockWriter.java"
26-
- "simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulator.java"
22+
- "server/src/main/java/org/hiero/block/server/Server.java"
23+
- "server/src/main/java/org/hiero/block/server/mediator/NoOpLiveStreamMediator.java"
24+
- "server/src/main/java/org/hiero/block/server/producer/NoOpProducerObserver.java"
25+
- "server/src/main/java/org/hiero/block/server/persistence/storage/write/NoOpBlockWriter.java"
26+
- "simulator/src/main/java/org/hiero/block/simulator/BlockStreamSimulator.java"
2727
- "suites/**"
2828
- "tools/**"

‎common/src/main/java/module-info.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
module com.hedera.block.common {
3-
exports com.hedera.block.common.constants;
4-
exports com.hedera.block.common.utils;
5-
exports com.hedera.block.common.hasher;
2+
module org.hiero.block.common {
3+
exports org.hiero.block.common.constants;
4+
exports org.hiero.block.common.utils;
5+
exports org.hiero.block.common.hasher;
66

77
requires transitive com.hedera.block.stream;
88
requires transitive com.hedera.pbj.runtime;

‎common/src/main/java/com/hedera/block/common/constants/StringsConstants.java ‎common/src/main/java/org/hiero/block/common/constants/StringsConstants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.constants;
2+
package org.hiero.block.common.constants;
33

44
/** A class that hold common String literals used across projects. */
55
public final class StringsConstants {

‎common/src/main/java/com/hedera/block/common/hasher/ConcurrentStreamingTreeHasher.java ‎common/src/main/java/org/hiero/block/common/hasher/ConcurrentStreamingTreeHasher.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.hasher;
2+
package org.hiero.block.common.hasher;
33

4-
import static com.hedera.block.common.hasher.HashingUtilities.noThrowSha384HashOf;
54
import static java.util.Objects.requireNonNull;
5+
import static org.hiero.block.common.hasher.HashingUtilities.noThrowSha384HashOf;
66

7-
import com.hedera.block.common.utils.Preconditions;
87
import com.hedera.pbj.runtime.io.buffer.Bytes;
98
import edu.umd.cs.findbugs.annotations.NonNull;
109
import java.nio.ByteBuffer;
@@ -13,6 +12,7 @@
1312
import java.util.List;
1413
import java.util.concurrent.CompletableFuture;
1514
import java.util.concurrent.ExecutorService;
15+
import org.hiero.block.common.utils.Preconditions;
1616

1717
/**
1818
* A {@link StreamingTreeHasher} that computes the root hash of a perfect binary Merkle tree of {@link Bytes} leaves

‎common/src/main/java/com/hedera/block/common/hasher/Hashes.java ‎common/src/main/java/org/hiero/block/common/hasher/Hashes.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.hasher;
2+
package org.hiero.block.common.hasher;
33

44
import edu.umd.cs.findbugs.annotations.NonNull;
55
import java.nio.ByteBuffer;

‎common/src/main/java/com/hedera/block/common/hasher/HashingUtilities.java ‎common/src/main/java/org/hiero/block/common/hasher/HashingUtilities.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.hasher;
2+
package org.hiero.block.common.hasher;
33

44
import com.hedera.hapi.block.BlockItemUnparsed;
55
import com.hedera.hapi.block.stream.BlockProof;

‎common/src/main/java/com/hedera/block/common/hasher/NaiveStreamingTreeHasher.java ‎common/src/main/java/org/hiero/block/common/hasher/NaiveStreamingTreeHasher.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.hasher;
2+
package org.hiero.block.common.hasher;
33

4-
import static com.hedera.block.common.hasher.HashingUtilities.noThrowSha384HashOf;
54
import static java.util.Objects.requireNonNull;
5+
import static org.hiero.block.common.hasher.HashingUtilities.noThrowSha384HashOf;
66

77
import com.hedera.pbj.runtime.io.buffer.Bytes;
88
import edu.umd.cs.findbugs.annotations.NonNull;

‎common/src/main/java/com/hedera/block/common/hasher/StreamingTreeHasher.java ‎common/src/main/java/org/hiero/block/common/hasher/StreamingTreeHasher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.hasher;
2+
package org.hiero.block.common.hasher;
33

44
import com.hedera.pbj.runtime.io.buffer.Bytes;
55
import com.swirlds.common.crypto.DigestType;

‎common/src/main/java/com/hedera/block/common/utils/ChunkUtils.java ‎common/src/main/java/org/hiero/block/common/utils/ChunkUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.utils;
2+
package org.hiero.block.common.utils;
33

44
import edu.umd.cs.findbugs.annotations.NonNull;
55
import java.util.ArrayList;

‎common/src/main/java/com/hedera/block/common/utils/FileUtilities.java ‎common/src/main/java/org/hiero/block/common/utils/FileUtilities.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.utils;
2+
package org.hiero.block.common.utils;
33

44
import edu.umd.cs.findbugs.annotations.NonNull;
55
import java.io.IOException;

‎common/src/main/java/com/hedera/block/common/utils/MathUtilities.java ‎common/src/main/java/org/hiero/block/common/utils/MathUtilities.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.utils;
2+
package org.hiero.block.common.utils;
33

44
import java.util.Arrays;
55

‎common/src/main/java/com/hedera/block/common/utils/Preconditions.java ‎common/src/main/java/org/hiero/block/common/utils/Preconditions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.utils;
2+
package org.hiero.block.common.utils;
33

44
import edu.umd.cs.findbugs.annotations.NonNull;
55

‎common/src/main/java/com/hedera/block/common/utils/StringUtilities.java ‎common/src/main/java/org/hiero/block/common/utils/StringUtilities.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.utils;
2+
package org.hiero.block.common.utils;
33

44
import java.util.Objects;
55

‎common/src/test/java/com/hedera/block/common/CommonsTestUtility.java ‎common/src/test/java/org/hiero/block/common/CommonsTestUtility.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common;
2+
package org.hiero.block.common;
33

44
import java.util.stream.Stream;
55
import org.junit.jupiter.params.provider.Arguments;

‎common/src/test/java/com/hedera/block/common/hasher/ConcurrentStreamingTreeHasherTest.java ‎common/src/test/java/org/hiero/block/common/hasher/ConcurrentStreamingTreeHasherTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.hasher;
2+
package org.hiero.block.common.hasher;
33

4-
import static com.hedera.block.common.hasher.ConcurrentStreamingTreeHasher.rootHashFrom;
5-
import static com.hedera.block.common.hasher.StreamingTreeHasher.HASH_LENGTH;
64
import static java.util.Objects.requireNonNull;
5+
import static org.hiero.block.common.hasher.ConcurrentStreamingTreeHasher.rootHashFrom;
6+
import static org.hiero.block.common.hasher.StreamingTreeHasher.HASH_LENGTH;
77
import static org.junit.jupiter.api.Assertions.assertEquals;
88
import static org.junit.jupiter.api.Assertions.assertThrows;
99

‎common/src/test/java/com/hedera/block/common/utils/ChunkUtilsTest.java ‎common/src/test/java/org/hiero/block/common/utils/ChunkUtilsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.utils;
2+
package org.hiero.block.common.utils;
33

44
import static org.junit.jupiter.api.Assertions.assertEquals;
55
import static org.junit.jupiter.api.Assertions.assertThrows;

‎common/src/test/java/com/hedera/block/common/utils/FileUtilitiesTest.java ‎common/src/test/java/org/hiero/block/common/utils/FileUtilitiesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.utils;
2+
package org.hiero.block.common.utils;
33

44
import static org.assertj.core.api.Assertions.assertThat;
55
import static org.assertj.core.api.Assertions.assertThatIOException;

‎common/src/test/java/com/hedera/block/common/utils/MathUtilitiesTest.java ‎common/src/test/java/org/hiero/block/common/utils/MathUtilitiesTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
package com.hedera.block.common.utils;
2+
package org.hiero.block.common.utils;
33

44
import static org.assertj.core.api.Assertions.assertThat;
55

@@ -15,7 +15,7 @@ class MathUtilitiesTest {
1515
* returns {@code true} if the input number is a power of two.
1616
*/
1717
@ParameterizedTest
18-
@MethodSource("com.hedera.block.common.CommonsTestUtility#powerOfTwoIntegers")
18+
@MethodSource("org.hiero.block.common.CommonsTestUtility#powerOfTwoIntegers")
1919
void testIsPowerOfTwoPass(final int toTest) {
2020
final boolean actual = MathUtilities.isPowerOfTwo(toTest);
2121
assertThat(actual).isTrue();
@@ -27,8 +27,8 @@ void testIsPowerOfTwoPass(final int toTest) {
2727
*/
2828
@ParameterizedTest
2929
@MethodSource({
30-
"com.hedera.block.common.CommonsTestUtility#nonPowerOfTwoIntegers",
31-
"com.hedera.block.common.CommonsTestUtility#negativePowerOfTwoIntegers"
30+
"org.hiero.block.common.CommonsTestUtility#nonPowerOfTwoIntegers",
31+
"org.hiero.block.common.CommonsTestUtility#negativePowerOfTwoIntegers"
3232
})
3333
void testIsPowerOfTwoFail(final int toTest) {
3434
final boolean actual = MathUtilities.isPowerOfTwo(toTest);
@@ -40,7 +40,7 @@ void testIsPowerOfTwoFail(final int toTest) {
4040
* returns {@code true} if the input number is even.
4141
*/
4242
@ParameterizedTest
43-
@MethodSource("com.hedera.block.common.CommonsTestUtility#evenIntegers")
43+
@MethodSource("org.hiero.block.common.CommonsTestUtility#evenIntegers")
4444
void testIsEvenPass(final int toTest) {
4545
final boolean actual = MathUtilities.isEven(toTest);
4646
assertThat(actual).isTrue();
@@ -51,7 +51,7 @@ void testIsEvenPass(final int toTest) {
5151
* returns {@code false} if the input number is odd.
5252
*/
5353
@ParameterizedTest
54-
@MethodSource("com.hedera.block.common.CommonsTestUtility#oddIntegers")
54+
@MethodSource("org.hiero.block.common.CommonsTestUtility#oddIntegers")
5555
void testIsEvenFail(final int toTest) {
5656
final boolean actual = MathUtilities.isEven(toTest);
5757
assertThat(actual).isFalse();
@@ -63,7 +63,7 @@ void testIsEvenFail(final int toTest) {
6363
* the input to check is a positive power of 10.
6464
*/
6565
@ParameterizedTest
66-
@MethodSource("com.hedera.block.common.CommonsTestUtility#positivePowersOf10")
66+
@MethodSource("org.hiero.block.common.CommonsTestUtility#positivePowersOf10")
6767
void testIsPositivePowerOf10Pass(final long toTest) {
6868
final boolean actual = MathUtilities.isPositivePowerOf10(toTest);
6969
assertThat(actual).isTrue();
@@ -76,8 +76,8 @@ void testIsPositivePowerOf10Pass(final long toTest) {
7676
*/
7777
@ParameterizedTest
7878
@MethodSource({
79-
"com.hedera.block.common.CommonsTestUtility#negativePowersOf10",
80-
"com.hedera.block.common.CommonsTestUtility#nonPowersOf10"
79+
"org.hiero.block.common.CommonsTestUtility#negativePowersOf10",
80+
"org.hiero.block.common.CommonsTestUtility#nonPowersOf10"
8181
})
8282
void testIsPositivePowerOf10Fail(final long toTest) {
8383
final boolean actual = MathUtilities.isPositivePowerOf10(toTest);

0 commit comments

Comments
 (0)