From 9f30bfdbd9394e7e16023e8198d62e2063a999f9 Mon Sep 17 00:00:00 2001
From: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>
Date: Tue, 5 Feb 2019 16:36:10 -0800
Subject: [PATCH] Merge PR #3505: add json tags to auth params and fix tags in
 slashing

---
 x/auth/params.go     | 10 +++++-----
 x/slashing/params.go | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/x/auth/params.go b/x/auth/params.go
index bf0607cf27..11374bd8b6 100644
--- a/x/auth/params.go
+++ b/x/auth/params.go
@@ -34,11 +34,11 @@ var _ params.ParamSet = &Params{}
 
 // Params defines the parameters for the auth module.
 type Params struct {
-	MaxMemoCharacters      uint64
-	TxSigLimit             uint64 // max total number of signatures per tx
-	TxSizeCostPerByte      uint64
-	SigVerifyCostED25519   uint64
-	SigVerifyCostSecp256k1 uint64
+	MaxMemoCharacters      uint64 `json:"max_memo_characters"`
+	TxSigLimit             uint64 `json:"tx_sig_limit"`
+	TxSizeCostPerByte      uint64 `json:"tx_size_cost_per_byte"`
+	SigVerifyCostED25519   uint64 `json:"sig_verify_cost_ed25519"`
+	SigVerifyCostSecp256k1 uint64 `json:"sig_verify_cost_secp256k1"`
 }
 
 // ParamTable for staking module
diff --git a/x/slashing/params.go b/x/slashing/params.go
index 87b3edddd5..1b500882c6 100644
--- a/x/slashing/params.go
+++ b/x/slashing/params.go
@@ -35,12 +35,12 @@ func ParamKeyTable() params.KeyTable {
 
 // Params - used for initializing default parameter for slashing at genesis
 type Params struct {
-	MaxEvidenceAge          time.Duration `json:"max-evidence-age"`
-	SignedBlocksWindow      int64         `json:"signed-blocks-window"`
-	MinSignedPerWindow      sdk.Dec       `json:"min-signed-per-window"`
-	DowntimeJailDuration    time.Duration `json:"downtime-jail-duration"`
-	SlashFractionDoubleSign sdk.Dec       `json:"slash-fraction-double-sign"`
-	SlashFractionDowntime   sdk.Dec       `json:"slash-fraction-downtime"`
+	MaxEvidenceAge          time.Duration `json:"max_evidence_age"`
+	SignedBlocksWindow      int64         `json:"signed_blocks_window"`
+	MinSignedPerWindow      sdk.Dec       `json:"min_signed_per_window"`
+	DowntimeJailDuration    time.Duration `json:"downtime_jail_duration"`
+	SlashFractionDoubleSign sdk.Dec       `json:"slash_fraction_double_sign"`
+	SlashFractionDowntime   sdk.Dec       `json:"slash_fraction_downtime"`
 }
 
 func (p Params) String() string {