Merge pull request #7356 from ziggie1984/benchmarking-fundinglocked

Fix Benchmark Test (BenchmarkReadMessage/Funding_Locked) in the lnwire  package
This commit is contained in:
Oliver Gugger
2023-05-10 10:22:28 +02:00
committed by GitHub
4 changed files with 26 additions and 2 deletions

View File

@@ -196,6 +196,10 @@ unit-race:
@$(call print, "Running unit race tests.")
env CGO_ENABLED=1 GORACE="history_size=7 halt_on_errors=1" $(UNIT_RACE)
unit-bench: $(BTCD_BIN)
@$(call print, "Running benchmark tests.")
$(UNIT_BENCH)
# =============
# FLAKE HUNTING
# =============

View File

@@ -18,6 +18,9 @@
* [Ensure that both the byte and string form of a TXID is populated in the
lnrpc.Outpoint message](https://github.com/lightningnetwork/lnd/pull/7624).
* [Fix Benchmark Test (BenchmarkReadMessage/Channel_Ready) in the lnwire
package](https://github.com/lightningnetwork/lnd/pull/7356)
## RPC
* [SendOutputs](https://github.com/lightningnetwork/lnd/pull/7631) now adheres
@@ -49,3 +52,4 @@ unlock or create.
* Erik Arvstedt
* hieblmi
* Jordi Montes
* ziggie1984

View File

@@ -452,8 +452,20 @@ func newMsgChannelReady(t testing.TB, r io.Reader) *lnwire.ChannelReady {
pubKey := randPubKey(t)
msg := lnwire.NewChannelReady(lnwire.ChannelID(c), pubKey)
msg.ExtraData = createExtraData(t, r)
// When testing the ChannelReady msg type in the WriteMessage
// function we need to populate the alias here to test the encoding
// of the TLV stream.
aliasScid := lnwire.NewShortChanIDFromInt(rand.Uint64())
msg := &lnwire.ChannelReady{
ChanID: lnwire.ChannelID(c),
NextPerCommitmentPoint: pubKey,
AliasScid: &aliasScid,
ExtraData: make([]byte, 0),
}
// We do not include the TLV record (aliasScid) into the ExtraData
// because when the msg is encoded the ExtraData is overwritten
// with the current aliasScid value.
return msg
}

View File

@@ -100,12 +100,16 @@ ifeq ($(UNIT_TARGETED), yes)
UNIT := $(GOTEST) -tags="$(DEV_TAGS) $(LOG_TAGS)" $(TEST_FLAGS) $(UNITPKG)
UNIT_DEBUG := $(GOTEST) -v -tags="$(DEV_TAGS) $(LOG_TAGS)" $(TEST_FLAGS) $(UNITPKG)
UNIT_RACE := $(GOTEST) -tags="$(DEV_TAGS) $(LOG_TAGS) lowscrypt" $(TEST_FLAGS) -race $(UNITPKG)
# NONE is a special value which selects no other tests but only executes the benchmark tests here.
UNIT_BENCH := $(GOTEST) -tags="$(DEV_TAGS) $(LOG_TAGS)" -test.bench=. -test.run=NONE $(UNITPKG)
endif
ifeq ($(UNIT_TARGETED), no)
UNIT := $(GOLIST) | $(XARGS) env $(GOTEST) -tags="$(DEV_TAGS) $(LOG_TAGS)" $(TEST_FLAGS)
UNIT_DEBUG := $(GOLIST) | $(XARGS) env $(GOTEST) -v -tags="$(DEV_TAGS) $(LOG_TAGS)" $(TEST_FLAGS)
UNIT_RACE := $(UNIT) -race
# NONE is a special value which selects no other tests but only executes the benchmark tests here.
UNIT_BENCH := $(GOLIST) | $(XARGS) env $(GOTEST) -tags="$(DEV_TAGS) $(LOG_TAGS)" -test.bench=. -test.run=NONE
endif