diff --git a/.gitignore b/.gitignore index 157010fd9..106af84c2 100644 --- a/.gitignore +++ b/.gitignore @@ -49,12 +49,6 @@ cmd/lncli/lncli mobile/build mobile/*_generated.go -# Files created for fuzzing. -fuzz/**/*-fuzz.zip -fuzz/**/corpus -fuzz/**/crashers -fuzz/**/suppressions - # vim *.swp diff --git a/Makefile b/Makefile index 49dcfe4c7..174fe0f03 100644 --- a/Makefile +++ b/Makefile @@ -82,18 +82,6 @@ $(GOIMPORTS_BIN): @$(call print, "Installing goimports.") cd $(TOOLS_DIR); go install -trimpath $(GOIMPORTS_PKG) -$(GOFUZZ_BIN): - @$(call print, "Installing go-fuzz.") - cd $(TOOLS_DIR); go install -trimpath $(GOFUZZ_PKG) - -$(GOFUZZ_BUILD_BIN): - @$(call print, "Installing go-fuzz-build.") - cd $(TOOLS_DIR); go install -trimpath $(GOFUZZ_BUILD_PKG) - -$(GOFUZZ_DEP_BIN): - @$(call print, "Installing go-fuzz-dep.") - cd $(TOOLS_DIR); go install -trimpath $(GOFUZZ_DEP_PKG) - # ============ # INSTALLATION # ============ @@ -228,9 +216,9 @@ flakehunter-parallel: # FUZZING # ============= -fuzz: $(GOFUZZ_BIN) +fuzz: @$(call print, "Fuzzing packages '$(FUZZPKG)'.") - scripts/fuzz.sh run "$(FUZZPKG)" "$(FUZZ_TEST_RUN_TIME)" "$(FUZZ_NUM_PROCESSES)" + scripts/fuzz.sh run "$(FUZZPKG)" "$(FUZZ_TEST_RUN_TIME)" "$(FUZZ_NUM_PROCESSES)" # ========= # UTILITIES diff --git a/build/dependencies.go b/build/dependencies.go index 10d30a6d7..234df7161 100644 --- a/build/dependencies.go +++ b/build/dependencies.go @@ -3,7 +3,7 @@ package build -// This file is a workaround to make sure go mod keeps around the btcd and fuzz +// This file is a workaround to make sure go mod keeps around the btcd // dependencies in the go.sum file that we only use during certain tasks (such // as integration tests or fuzzing) or only for certain operating systems. For // example, the specific btcd import makes sure the indirect dependency @@ -11,5 +11,4 @@ package build // tag, this dependency never ends up in the final lnd binary. import ( _ "github.com/btcsuite/btcd" - _ "github.com/dvyukov/go-fuzz/go-fuzz-dep" ) diff --git a/go.mod b/go.mod index 5042db478..0e3bccc82 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,6 @@ require ( github.com/btcsuite/btcwallet/wtxmgr v1.5.0 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f github.com/davecgh/go-spew v1.1.1 - github.com/dvyukov/go-fuzz v0.0.0-20210602112143-b1f3d6f4ef4e github.com/go-errors/errors v1.0.1 github.com/golang/protobuf v1.5.2 github.com/gorilla/websocket v1.4.2 diff --git a/go.sum b/go.sum index eb3a1283a..a7b9c9407 100644 --- a/go.sum +++ b/go.sum @@ -179,8 +179,6 @@ github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5Jflh github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dvyukov/go-fuzz v0.0.0-20210602112143-b1f3d6f4ef4e h1:qTP1telKJHlToHlwPQNmVg4yfMDMHe4Z3SYmzkrvA2M= -github.com/dvyukov/go-fuzz v0.0.0-20210602112143-b1f3d6f4ef4e/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= diff --git a/tools/go.mod b/tools/go.mod index 7dd4e2c6c..e834ae439 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -4,7 +4,6 @@ go 1.16 require ( github.com/btcsuite/btcd v0.23.1 - github.com/dvyukov/go-fuzz v0.0.0-20210602112143-b1f3d6f4ef4e github.com/elazarl/go-bindata-assetfs v1.0.1 // indirect github.com/golangci/golangci-lint v1.46.2 github.com/ory/go-acc v0.2.6 diff --git a/tools/go.sum b/tools/go.sum index d30583868..641f8ee8a 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -224,8 +224,6 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dvyukov/go-fuzz v0.0.0-20210602112143-b1f3d6f4ef4e h1:qTP1telKJHlToHlwPQNmVg4yfMDMHe4Z3SYmzkrvA2M= -github.com/dvyukov/go-fuzz v0.0.0-20210602112143-b1f3d6f4ef4e/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw= github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= diff --git a/tools/tools.go b/tools/tools.go index fc0da400c..5163ee6b5 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -9,9 +9,6 @@ package lnd // dependencies here and pin the version in go.mod. import ( _ "github.com/btcsuite/btcd" - _ "github.com/dvyukov/go-fuzz/go-fuzz" - _ "github.com/dvyukov/go-fuzz/go-fuzz-build" - _ "github.com/dvyukov/go-fuzz/go-fuzz-dep" _ "github.com/golangci/golangci-lint/cmd/golangci-lint" _ "github.com/ory/go-acc" _ "github.com/rinchsan/gosimports/cmd/gosimports"