Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: nextNode ID for release version > 0.56.0 #765

Merged
merged 5 commits into from
Nov 6, 2024
Merged

fix: nextNode ID for release version > 0.56.0 #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
622b8c5
increase hedera version to 0.56.0
JeffreyDallas Oct 29, 2024
ea80667
Merge branch 'main' into 00742-D-rm-nextNodeID
JeffreyDallas Nov 1, 2024
49fbc77
Merge branch 'main' into 00742-D-rm-nextNodeID
JeffreyDallas Nov 5, 2024
0a22a65
fix version in test util
JeffreyDallas Nov 6, 2024
c92d766
Merge commit '1973275bd7e1a6da19e26c32e396d21cd4229d9f' into 00742-D-…
JeffreyDallas Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/zxc-e2e-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
if: ${{ runner.os == 'linux' && (inputs.npm-test-script == 'test-e2e-node-local-hedera' || inputs.npm-test-script == 'test-e2e-node-local-ptt' || inputs.npm-test-script == 'test-e2e-node-add-local') && !cancelled() && !failure() }}
run: |
cd ..
git clone https://github.com/hashgraph/hedera-services.git --depth 1 --branch v0.54.0-alpha.4
git clone https://github.com/hashgraph/hedera-services.git --depth 1 --branch v0.56.0
cd hedera-services
ls -ltr
${{ env.CG_EXEC }} ./gradlew assemble --stacktrace --info
Expand Down
2 changes: 1 addition & 1 deletion src/core/profile_manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ export class ProfileManager {
nodeSeq += 1
}

if (releaseVersion.minor >= 41) {
if (releaseVersion.minor >= 41 && releaseVersion.minor < 56) {
configLines.push(`nextNodeId, ${nodeSeq}`)
}

Expand Down
3 changes: 2 additions & 1 deletion test/test_util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ import type { BaseCommand } from '../src/commands/base.ts'
import type { NodeAlias } from '../src/types/aliases.ts'
import type { NetworkNodeServices } from '../src/core/network_node_services.ts'
import sinon from 'sinon'
import { HEDERA_PLATFORM_VERSION } from '../version.js'

export const testLogger = logging.NewLogger('debug', true)
export const TEST_CLUSTER = 'solo-e2e'
export const HEDERA_PLATFORM_VERSION_TAG = 'v0.54.0-alpha.4'
export const HEDERA_PLATFORM_VERSION_TAG = HEDERA_PLATFORM_VERSION

export function getTestCacheDir (testName?: string) {
const baseDir = 'test/data/tmp'
Expand Down
2 changes: 1 addition & 1 deletion version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
export const JAVA_VERSION = '21.0.1+12'
export const HELM_VERSION = 'v3.14.2'
export const SOLO_CHART_VERSION = '0.34.0'
export const HEDERA_PLATFORM_VERSION = 'v0.54.0-alpha.4'
export const HEDERA_PLATFORM_VERSION = 'v0.56.0'
export const MIRROR_NODE_VERSION = '0.116.0'
export const HEDERA_EXPLORER_VERSION = '0.2.1'
Loading