From 12e0ea6ea79b1110be42654bc3abd7688f5c39a3 Mon Sep 17 00:00:00 2001 From: "M. J. Fromberger" Date: Wed, 13 Apr 2022 14:28:54 -0700 Subject: [PATCH] confix: add default mempool.version = "v1" in v0.35. (#8335) --- go.mod | 2 +- go.sum | 4 ++-- scripts/confix/confix.go | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8a2e273bf..9d32f13ef 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/creachadair/atomicfile v0.2.4 github.com/creachadair/taskgroup v0.3.2 - github.com/creachadair/tomledit v0.0.15 + github.com/creachadair/tomledit v0.0.16 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect diff --git a/go.sum b/go.sum index 9a2c9c90e..90dd5c55d 100644 --- a/go.sum +++ b/go.sum @@ -227,8 +227,8 @@ github.com/creachadair/atomicfile v0.2.4 h1:GRjpQLmz/78I4+nBQpGMFrRa9yrL157AUTrA github.com/creachadair/atomicfile v0.2.4/go.mod h1:BRq8Une6ckFneYXZQ+kO7p1ZZP3I2fzVzf28JxrIkBc= github.com/creachadair/taskgroup v0.3.2 h1:zlfutDS+5XG40AOxcHDSThxKzns8Tnr9jnr6VqkYlkM= github.com/creachadair/taskgroup v0.3.2/go.mod h1:wieWwecHVzsidg2CsUnFinW1faVN4+kq+TDlRJQ0Wbk= -github.com/creachadair/tomledit v0.0.15 h1:g/qlpwSFIXEngyz8gcTEGZtvdGBLHODwV+Z0BFILVxw= -github.com/creachadair/tomledit v0.0.15/go.mod h1:gvtfnSZLa+YNQD28vaPq0Nk12bRxEhmUdBzAWn+EGF4= +github.com/creachadair/tomledit v0.0.16 h1:PDNxgDjeeiNk1cyFfliIVQmagh1jPbDMabOw9yfSKLk= +github.com/creachadair/tomledit v0.0.16/go.mod h1:gvtfnSZLa+YNQD28vaPq0Nk12bRxEhmUdBzAWn+EGF4= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= diff --git a/scripts/confix/confix.go b/scripts/confix/confix.go index c6d39f62b..d5434b514 100644 --- a/scripts/confix/confix.go +++ b/scripts/confix/confix.go @@ -116,6 +116,16 @@ var plan = transform.Plan{ T: transform.Remove(parser.Key{"mempool", "wal-dir"}), ErrorOK: true, }, + { + // Added in https://github.com/tendermint/tendermint/pull/6466. + Desc: `Add mempool.version default to "v1"`, + T: transform.EnsureKey(parser.Key{"mempool"}, &parser.KeyValue{ + Block: parser.Comments{`Mempool version to use`}, + Name: parser.Key{"version"}, + Value: parser.MustValue(`"v1"`), + }), + ErrorOK: true, + }, { // Since https://github.com/tendermint/tendermint/pull/6323. Desc: "Add new [p2p] queue-type setting",