From 8b4b09319c8a359d45ca47529d05a3738c477b9b Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Fri, 2 Jun 2023 13:33:48 -0500 Subject: [PATCH] rpctest: Enable treasury integration test. This updates the RPC integration test framework to the latest development version so it works properly with the latest incarnation of simnet and re-enables the treasury integration test that relies on it. --- go.mod | 28 +++++++++---------- go.sum | 16 +++++------ .../integration/rpctests/treasury_test.go | 5 ---- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index d8fa07c986..7ec7378691 100644 --- a/go.mod +++ b/go.mod @@ -4,33 +4,33 @@ go 1.19 require ( github.com/davecgh/go-spew v1.1.1 - github.com/decred/base58 v1.0.4 - github.com/decred/dcrd/addrmgr/v2 v2.0.0 - github.com/decred/dcrd/bech32 v1.1.2 + github.com/decred/base58 v1.0.5 + github.com/decred/dcrd/addrmgr/v2 v2.0.1 + github.com/decred/dcrd/bech32 v1.1.3 github.com/decred/dcrd/blockchain/stake/v5 v5.0.0 github.com/decred/dcrd/blockchain/standalone/v2 v2.1.0 github.com/decred/dcrd/blockchain/v5 v5.0.0 - github.com/decred/dcrd/certgen v1.1.1 + github.com/decred/dcrd/certgen v1.1.2 github.com/decred/dcrd/chaincfg/chainhash v1.0.4 github.com/decred/dcrd/chaincfg/v3 v3.1.1 github.com/decred/dcrd/connmgr/v3 v3.1.0 - github.com/decred/dcrd/container/apbf v1.0.0 + github.com/decred/dcrd/container/apbf v1.0.1 github.com/decred/dcrd/crypto/blake256 v1.0.1 - github.com/decred/dcrd/crypto/ripemd160 v1.0.1 + github.com/decred/dcrd/crypto/ripemd160 v1.0.2 github.com/decred/dcrd/database/v3 v3.0.0 - github.com/decred/dcrd/dcrec v1.0.0 - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 + github.com/decred/dcrd/dcrec v1.0.1 + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 github.com/decred/dcrd/dcrjson/v4 v4.0.1 github.com/decred/dcrd/dcrutil/v4 v4.0.0 github.com/decred/dcrd/gcs/v4 v4.0.0 - github.com/decred/dcrd/lru v1.1.1 - github.com/decred/dcrd/math/uint256 v1.0.0 - github.com/decred/dcrd/peer/v3 v3.0.0 + github.com/decred/dcrd/lru v1.1.2 + github.com/decred/dcrd/math/uint256 v1.0.1 + github.com/decred/dcrd/peer/v3 v3.0.1 github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.0.0 github.com/decred/dcrd/rpcclient/v8 v8.0.0 github.com/decred/dcrd/txscript/v4 v4.0.0 github.com/decred/dcrd/wire v1.5.0 - github.com/decred/dcrtest/dcrdtest v0.0.0-20221125134442-85f922c0880e + github.com/decred/dcrtest/dcrdtest v0.0.0-20230414060908-777773235e3b github.com/decred/go-socks v1.1.0 github.com/decred/slog v1.2.0 github.com/gorilla/websocket v1.5.0 @@ -38,7 +38,7 @@ require ( github.com/jrick/bitset v1.0.0 github.com/jrick/logrotate v1.0.0 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - golang.org/x/sys v0.5.0 + golang.org/x/sys v0.8.0 golang.org/x/term v0.5.0 lukechampine.com/blake3 v1.2.1 ) @@ -46,7 +46,7 @@ require ( require ( github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect github.com/dchest/siphash v1.2.3 // indirect - github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2 // indirect + github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3 // indirect github.com/decred/dcrd/hdkeychain/v3 v3.1.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect diff --git a/go.sum b/go.sum index faced0d15b..a2d860be9a 100644 --- a/go.sum +++ b/go.sum @@ -4,12 +4,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dchest/siphash v1.2.3 h1:QXwFc8cFOR2dSa/gE6o/HokBMWtLUaNDVd+22aKHeEA= github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIXMPAkHc= -github.com/decred/base58 v1.0.4 h1:QJC6B0E0rXOPA8U/kw2rP+qiRJsUaE2Er+pYb3siUeA= -github.com/decred/base58 v1.0.4/go.mod h1:jJswKPEdvpFpvf7dsDvFZyLT22xZ9lWqEByX38oGd9E= -github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2 h1:bX7rtGTMBDJxujZ29GNqtn7YCAdINjHKnA6J6tBBv6s= -github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2/go.mod h1:d0H8xGMWbiIQP7gN3v2rByWUcuZPm9YsgmnfoxgbINc= -github.com/decred/dcrtest/dcrdtest v0.0.0-20221125134442-85f922c0880e h1:QKtZ4/aNVRzMbW/dllhAiLJhXxswhaGGZgnu5Z9YtiM= -github.com/decred/dcrtest/dcrdtest v0.0.0-20221125134442-85f922c0880e/go.mod h1:9QDaNncc0bWuMeZcbbPhLqUIeE+IBYLAsHio8+2++JI= +github.com/decred/base58 v1.0.5 h1:hwcieUM3pfPnE/6p3J100zoRfGkQxBulZHo7GZfOqic= +github.com/decred/base58 v1.0.5/go.mod h1:s/8lukEHFA6bUQQb/v3rjUySJ2hu+RioCzLukAVkrfw= +github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3 h1:l/lhv2aJCUignzls81+wvga0TFlyoZx8QxRMQgXpZik= +github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3/go.mod h1:AKpV6+wZ2MfPRJnTbQ6NPgWrKzbe9RCIlCF/FKzMtM8= +github.com/decred/dcrtest/dcrdtest v0.0.0-20230414060908-777773235e3b h1:I3IKV6w9Y/BxLqDlVn0IxtfXBDOCymVLLghMwMaOGi0= +github.com/decred/dcrtest/dcrdtest v0.0.0-20230414060908-777773235e3b/go.mod h1:a8b3exUFacAtsqaE3QSsfDfLWCb6JjJCLQxtoY7D9Dc= github.com/decred/go-socks v1.1.0 h1:dnENcc0KIqQo3HSXdgboXAHgqsCIutkqq6ntQjYtm2U= github.com/decred/go-socks v1.1.0/go.mod h1:sDhHqkZH0X4JjSa02oYOGhcGHYp12FsY1jQ/meV8md0= github.com/decred/slog v1.2.0 h1:soHAxV52B54Di3WtKLfPum9OFfWqwtf/ygf9njdfnPM= @@ -69,8 +69,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/internal/integration/rpctests/treasury_test.go b/internal/integration/rpctests/treasury_test.go index 7d46cea445..f3e59c7257 100644 --- a/internal/integration/rpctests/treasury_test.go +++ b/internal/integration/rpctests/treasury_test.go @@ -205,11 +205,6 @@ func assertTBaseAmount(t *testing.T, node *rpcclient.Client, amount int64) { // TestTreasury performs a test of treasury functionality across the entire // dcrd stack. func TestTreasury(t *testing.T) { - // TODO: Remove this comment and the nolint line below once the RPC - // test framework is updated to work with the latest simnet. - return - - // nolint:govet var handlers *rpcclient.NotificationHandlers net := chaincfg.SimNetParams()