Skip to content

Commit ab049b4

Browse files
vgonkivsvgonkivs
committed
reuse keyring keyName for fibre
1 parent 8bb3c83 commit ab049b4

4 files changed

Lines changed: 16 additions & 14 deletions

File tree

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,31 +152,31 @@ lint: lint-imports
152152
## test-unit: Run unit tests.
153153
test-unit:
154154
@echo "--> Running unit tests"
155-
@go test $(VERBOSE) -covermode=atomic -coverprofile=coverage.txt `go list ./... | grep -v nodebuilder/tests` $(LOG_AND_FILTER)
155+
@go test $(VERBOSE) -tags=fibre -covermode=atomic -coverprofile=coverage.txt `go list ./... | grep -v nodebuilder/tests` $(LOG_AND_FILTER)
156156
.PHONY: test-unit
157157

158158
## test-unit-fast: Run unit tests without coverage instrumentation.
159159
test-unit-fast:
160160
@echo "--> Running unit tests"
161-
@go test $(VERBOSE) `go list ./... | grep -v nodebuilder/tests` $(LOG_AND_FILTER)
161+
@go test $(VERBOSE) -tags=fibre `go list ./... | grep -v nodebuilder/tests` $(LOG_AND_FILTER)
162162
.PHONY: test-unit-fast
163163

164164
## test-unit-race: Run unit tests with data race detector.
165165
test-unit-race:
166166
@echo "--> Running unit tests with data race detector"
167-
@go test $(VERBOSE) -race -covermode=atomic -coverprofile=coverage.txt `go list ./... | grep -v nodebuilder/tests` $(LOG_AND_FILTER)
167+
@go test $(VERBOSE) -tags=fibre -race -covermode=atomic -coverprofile=coverage.txt `go list ./... | grep -v nodebuilder/tests` $(LOG_AND_FILTER)
168168
.PHONY: test-unit-race
169169

170170
## test-integration: Run integration tests located in nodebuilder/tests.
171171
test-integration:
172172
@echo "--> Running integrations tests $(VERBOSE) -tags=$(TAGS) $(INTEGRATION_RUN_LENGTH)"
173-
@go test $(VERBOSE) -timeout=20m -tags=$(TAGS) $(INTEGRATION_RUN_LENGTH) ./nodebuilder/tests
173+
@go test $(VERBOSE) -timeout=20m -tags=$(TAGS),fibre $(INTEGRATION_RUN_LENGTH) ./nodebuilder/tests
174174
.PHONY: test-integration
175175

176176
## test-integration-race: Run integration tests with data race detector located in nodebuilder/tests.
177177
test-integration-race:
178178
@echo "--> Running integration tests with data race detector -tags=$(TAGS)"
179-
@go test -race -tags=$(TAGS) ./nodebuilder/tests
179+
@go test -race -tags=$(TAGS),fibre ./nodebuilder/tests
180180
.PHONY: test-integration-race
181181

182182
## test-blob: Run blob module tests via Tastora framework.

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2756,11 +2756,9 @@ google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOl
27562756
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
27572757
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 h1:XzmzkmB14QhVhgnawEVsOn6OFsnpyxNPRY9QV01dNB0=
27582758
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:L43LFes82YgSonw6iTXTxXUX1OlULt4AQtkik4ULL/I=
2759-
google.golang.org/genproto/googleapis/api v0.0.0-20260401001100-f93e5f3e9f0f h1:K3zPU40OFjwD5YKADLMLoiL0L7JJpBgEdLqGuCNPfp0=
2760-
google.golang.org/genproto/googleapis/api v0.0.0-20260401001100-f93e5f3e9f0f/go.mod h1:EIQZ5bFCfRQDV4MhRle7+OgjNtZ6P1PiZBgAKuxXu/Y=
2759+
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
27612760
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
2762-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 h1:ndE4FoJqsIceKP2oYSnUZqhTdYufCYYkqwtFzfrhI7w=
2763-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
2761+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
27642762
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
27652763
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
27662764
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=

‎nodebuilder/fibre/constructor.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/celestiaorg/celestia-node/fibre"
1313
"github.com/celestiaorg/celestia-node/libs/fxutil"
1414
"github.com/celestiaorg/celestia-node/nodebuilder/core"
15+
"github.com/celestiaorg/celestia-node/nodebuilder/state"
1516
"github.com/celestiaorg/celestia-node/state/txclient"
1617
)
1718

@@ -39,8 +40,13 @@ func ConstructModule(coreCfg *core.Config) fx.Option {
3940
)
4041
}
4142

42-
func newAppFibreClient(keyring keyring.Keyring, conn *grpc.ClientConn) (*appfibre.Client, error) {
43+
func newAppFibreClient(
44+
keyring keyring.Keyring,
45+
keyName state.AccountName,
46+
conn *grpc.ClientConn,
47+
) (*appfibre.Client, error) {
4348
cfg := appfibre.DefaultClientConfig()
49+
cfg.DefaultKeyName = string(keyName)
4450
cfg.StateAddress = conn.Target()
4551
return appfibre.NewClient(keyring, cfg)
4652
}

‎nodebuilder/tests/tastora/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2776,11 +2776,9 @@ google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOl
27762776
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
27772777
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 h1:XzmzkmB14QhVhgnawEVsOn6OFsnpyxNPRY9QV01dNB0=
27782778
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:L43LFes82YgSonw6iTXTxXUX1OlULt4AQtkik4ULL/I=
2779-
google.golang.org/genproto/googleapis/api v0.0.0-20260401001100-f93e5f3e9f0f h1:K3zPU40OFjwD5YKADLMLoiL0L7JJpBgEdLqGuCNPfp0=
2780-
google.golang.org/genproto/googleapis/api v0.0.0-20260401001100-f93e5f3e9f0f/go.mod h1:EIQZ5bFCfRQDV4MhRle7+OgjNtZ6P1PiZBgAKuxXu/Y=
2779+
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
27812780
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
2782-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 h1:ndE4FoJqsIceKP2oYSnUZqhTdYufCYYkqwtFzfrhI7w=
2783-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
2781+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
27842782
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
27852783
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
27862784
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=

0 commit comments

Comments
 (0)