Merge branch 'eclesio/storage-next-key' of github.com:ChainSafe/gossa…

…mer into eclesio/storage-next-key
ChainSafe · Sep 11, 2023 · ea4f90c · ea4f90c
2 parents 238a13e + 55823d6
commit ea4f90c
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
           echo "::set-output name=go-build::$(go env GOCACHE)"
           echo "::set-output name=go-mod::$(go env GOMODCACHE)"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Go build cache
         uses: actions/cache@v3
@@ -77,7 +77,7 @@ jobs:
           echo "::set-output name=go-build::$(go env GOCACHE)"
           echo "::set-output name=go-mod::$(go env GOMODCACHE)"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Go build cache
         uses: actions/cache@v3

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           all_but_latest: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-go@v4
         with:

diff --git a/.github/workflows/copyright.yml b/.github/workflows/copyright.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           all_but_latest: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-go@v4
         with:

diff --git a/.github/workflows/devnet.yml b/.github/workflows/devnet.yml
@@ -13,7 +13,7 @@ jobs:
         with:
           all_but_latest: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-go@v4
         with:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
       - name: Checkout main
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Deploy docs
         uses: mhausenblas/mkdocs-deploy-gh-pages@master

diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -24,7 +24,7 @@ jobs:
           echo "::set-output name=go-build::$(go env GOCACHE)"
           echo "::set-output name=go-mod::$(go env GOMODCACHE)"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Go build cache
         uses: actions/cache@v3

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -54,7 +54,7 @@ jobs:
           echo "::set-output name=go-build::$(go env GOCACHE)"
           echo "::set-output name=go-mod::$(go env GOMODCACHE)"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Go build cache
         uses: actions/cache@v3

diff --git a/.github/workflows/mocks.yml b/.github/workflows/mocks.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           all_but_latest: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-go@v4
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Node.js

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -11,7 +11,7 @@ jobs:
         chain: [polkadot, kusama, westend]
     runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v3

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -39,7 +39,7 @@ jobs:
           echo "::set-output name=go-build::$(go env GOCACHE)"
           echo "::set-output name=go-mod::$(go env GOMODCACHE)"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Go build cache
         uses: actions/cache@v3

diff --git a/.github/workflows/zombienet.yml b/.github/workflows/zombienet.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           echo "::set-output name=go-build::$(go env GOCACHE)"
           echo "::set-output name=go-mod::$(go env GOMODCACHE)"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Go build cache
         uses: actions/cache@v3
         with:

diff --git a/dot/node.go b/dot/node.go
@@ -258,7 +258,7 @@ func newNode(config *cfg.Config,
 		return nil, fmt.Errorf("checking if node is initialised: %w", err)
 	}
 
-	if isInitialised {
+	if !isInitialised {
 		err := builder.initNode(config)
 		if err != nil {
 			return nil, fmt.Errorf("cannot initialise node: %w", err)

diff --git a/dot/node_integration_test.go b/dot/node_integration_test.go
@@ -88,7 +88,7 @@ func TestNewNode(t *testing.T) {
 	mockServiceRegistry.EXPECT().RegisterService(gomock.Any()).Times(8)
 
 	m := NewMocknodeBuilderIface(ctrl)
-	m.EXPECT().isNodeInitialised(initConfig.BasePath).Return(false, nil)
+	m.EXPECT().isNodeInitialised(initConfig.BasePath).Return(true, nil)
 	m.EXPECT().createStateService(initConfig).DoAndReturn(func(config *cfg.Config) (*state.Service, error) {
 		stateSrvc := state.NewService(stateConfig)
 		// create genesis from configuration file