Skip to content

Commit 81ece9d

Browse files
authored
fix(ledger): Added json labels to all genesis structs (#964)
Signed-off-by: Akhil Repala <[email protected]>
1 parent d308be0 commit 81ece9d

File tree

4 files changed

+71
-71
lines changed

4 files changed

+71
-71
lines changed

ledger/byron/genesis.go

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,52 +39,52 @@ type ByronGenesis struct {
3939
}
4040

4141
type ByronGenesisBlockVersionData struct {
42-
HeavyDelThd int `json:",string"`
43-
MaxBlockSize int `json:",string"`
44-
MaxHeaderSize int `json:",string"`
45-
MaxProposalSize int `json:",string"`
46-
MaxTxSize int `json:",string"`
47-
MpcThd int `json:",string"`
48-
ScriptVersion int
49-
SlotDuration int `json:",string"`
50-
SoftforkRule ByronGenesisBlockVersionDataSoftforkRule
51-
TxFeePolicy ByronGenesisBlockVersionDataTxFeePolicy
52-
UnlockStakeEpoch uint64 `json:",string"`
53-
UpdateImplicit int `json:",string"`
54-
UpdateProposalThd int `json:",string"`
55-
UpdateVoteThd int `json:",string"`
42+
HeavyDelThd int `json:"heavyDelThd,string"`
43+
MaxBlockSize int `json:"maxBlockSize,string"`
44+
MaxHeaderSize int `json:"maxHeaderSize,string"`
45+
MaxProposalSize int `json:"maxProposalSize,string"`
46+
MaxTxSize int `json:"maxTxSize,string"`
47+
MpcThd int `json:"mpcThd,string"`
48+
ScriptVersion int `json:"scriptVersion"`
49+
SlotDuration int `json:"slotDuration,string"`
50+
SoftforkRule ByronGenesisBlockVersionDataSoftforkRule `json:"softforkRule"`
51+
TxFeePolicy ByronGenesisBlockVersionDataTxFeePolicy `json:"txFeePolicy"`
52+
UnlockStakeEpoch uint64 `json:"unlockStakeEpoch,string"`
53+
UpdateImplicit int `json:"updateImplicit,string"`
54+
UpdateProposalThd int `json:"updateProposalThd,string"`
55+
UpdateVoteThd int `json:"updateVoteThd,string"`
5656
}
5757

5858
type ByronGenesisBlockVersionDataSoftforkRule struct {
59-
InitThd int `json:",string"`
60-
MinThd int `json:",string"`
61-
ThdDecrement int `json:",string"`
59+
InitThd int `json:"initThd,string"`
60+
MinThd int `json:"minThd,string"`
61+
ThdDecrement int `json:"thdDecrement,string"`
6262
}
6363

6464
type ByronGenesisBlockVersionDataTxFeePolicy struct {
65-
Multiplier int `json:",string"`
66-
Summand int `json:",string"`
65+
Multiplier int `json:"multiplier,string"`
66+
Summand int `json:"summand,string"`
6767
}
6868

6969
type ByronGenesisProtocolConsts struct {
70-
K int
71-
ProtocolMagic int
72-
VssMinTTL int
73-
VssMaxTTL int
70+
K int `json:"k"`
71+
ProtocolMagic int `json:"protocolMagic"`
72+
VssMinTTL int `json:"vssMinTtl"`
73+
VssMaxTTL int `json:"vssMaxTtl"`
7474
}
7575

7676
type ByronGenesisHeavyDelegation struct {
77-
Cert string
78-
DelegatePk string
79-
IssuerPk string
80-
Omega int
77+
Cert string `json:"cert"`
78+
DelegatePk string `json:"delegatePk"`
79+
IssuerPk string `json:"issuerPk"`
80+
Omega int `json:"omega"`
8181
}
8282

8383
type ByronGenesisVssCert struct {
84-
ExpiryEpoch int
85-
Signature string
86-
SigningKey string
87-
VssKey string
84+
ExpiryEpoch int `json:"expiryEpoch"`
85+
Signature string `json:"signature"`
86+
SigningKey string `json:"signingKey"`
87+
VssKey string `json:"vssKey"`
8888
}
8989

9090
func (g *ByronGenesis) GenesisUtxos() ([]common.Utxo, error) {

ledger/conway/genesis.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,39 @@ type ConwayGenesis struct {
3838
}
3939

4040
type ConwayGenesisPoolVotingThresholds struct {
41-
CommitteeNormal *common.GenesisRat
42-
CommitteeNoConfidence *common.GenesisRat
43-
HardForkInitiation *common.GenesisRat
44-
MotionNoConfidence *common.GenesisRat
45-
PpSecurityGroup *common.GenesisRat
41+
CommitteeNormal *common.GenesisRat `json:"committeeNormal"`
42+
CommitteeNoConfidence *common.GenesisRat `json:"committeeNoConfidence"`
43+
HardForkInitiation *common.GenesisRat `json:"hardForkInitiation"`
44+
MotionNoConfidence *common.GenesisRat `json:"motionNoConfidence"`
45+
PpSecurityGroup *common.GenesisRat `json:"ppSecurityGroup"`
4646
}
4747

4848
type ConwayGenesisDRepVotingThresholds struct {
49-
MotionNoConfidence *common.GenesisRat
50-
CommitteeNormal *common.GenesisRat
51-
CommitteeNoConfidence *common.GenesisRat
52-
UpdateToConstitution *common.GenesisRat
53-
HardForkInitiation *common.GenesisRat
54-
PpNetworkGroup *common.GenesisRat
55-
PpEconomicGroup *common.GenesisRat
56-
PpTechnicalGroup *common.GenesisRat
57-
PpGovGroup *common.GenesisRat
58-
TreasuryWithdrawal *common.GenesisRat
49+
MotionNoConfidence *common.GenesisRat `json:"motionNoConfidence"`
50+
CommitteeNormal *common.GenesisRat `json:"committeeNormal"`
51+
CommitteeNoConfidence *common.GenesisRat `json:"committeeNoConfidence"`
52+
UpdateToConstitution *common.GenesisRat `json:"updateToConstitution"`
53+
HardForkInitiation *common.GenesisRat `json:"hardForkInitiation"`
54+
PpNetworkGroup *common.GenesisRat `json:"ppNetworkGroup"`
55+
PpEconomicGroup *common.GenesisRat `json:"ppEconomicGroup"`
56+
PpTechnicalGroup *common.GenesisRat `json:"ppTechnicalGroup"`
57+
PpGovGroup *common.GenesisRat `json:"ppGovGroup"`
58+
TreasuryWithdrawal *common.GenesisRat `json:"treasuryWithdrawal"`
5959
}
6060

6161
type ConwayGenesisConstitution struct {
62-
Anchor ConwayGenesisConstitutionAnchor
63-
Script string
62+
Anchor ConwayGenesisConstitutionAnchor `json:"anchor"`
63+
Script string `json:"script"`
6464
}
6565

6666
type ConwayGenesisConstitutionAnchor struct {
67-
DataHash string
68-
Url string
67+
DataHash string `json:"dataHash"`
68+
Url string `json:"url"`
6969
}
7070

7171
type ConwayGenesisCommittee struct {
72-
Members map[string]int
73-
Threshold map[string]int
72+
Members map[string]int `json:"members"`
73+
Threshold map[string]int `json:"threshold"`
7474
}
7575

7676
func NewConwayGenesisFromReader(r io.Reader) (ConwayGenesis, error) {

ledger/shelley/genesis.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -100,26 +100,26 @@ func (g ShelleyGenesis) MarshalCBOR() ([]byte, error) {
100100

101101
type ShelleyGenesisProtocolParams struct {
102102
cbor.StructAsArray
103-
MinFeeA uint
104-
MinFeeB uint
105-
MaxBlockBodySize uint
106-
MaxTxSize uint
107-
MaxBlockHeaderSize uint
108-
KeyDeposit uint
109-
PoolDeposit uint
110-
MaxEpoch uint `json:"eMax"`
111-
NOpt uint
112-
A0 *common.GenesisRat
113-
Rho *common.GenesisRat
114-
Tau *common.GenesisRat
103+
MinFeeA uint `json:"minFeeA"`
104+
MinFeeB uint `json:"minFeeB"`
105+
MaxBlockBodySize uint `json:"maxBlockBodySize"`
106+
MaxTxSize uint `json:"maxTxSize"`
107+
MaxBlockHeaderSize uint `json:"maxBlockHeaderSize"`
108+
KeyDeposit uint `json:"keyDeposit"`
109+
PoolDeposit uint `json:"poolDeposit"`
110+
MaxEpoch uint `json:"eMax"`
111+
NOpt uint `json:"nOpt"`
112+
A0 *common.GenesisRat `json:"a0"`
113+
Rho *common.GenesisRat `json:"rho"`
114+
Tau *common.GenesisRat `json:"tau"`
115115
Decentralization *common.GenesisRat `json:"decentralisationParam"`
116-
ExtraEntropy common.Nonce
116+
ExtraEntropy common.Nonce `json:"extraEntropy"`
117117
ProtocolVersion struct {
118-
Major uint
119-
Minor uint
120-
}
118+
Major uint `json:"major"`
119+
Minor uint `json:"minor"`
120+
} `json:"protocolVersion"`
121121
MinUtxoValue uint `json:"minUTxOValue"`
122-
MinPoolCost uint
122+
MinPoolCost uint `json:"minPoolCost"`
123123
}
124124

125125
func (p ShelleyGenesisProtocolParams) MarshalCBOR() ([]byte, error) {

ledger/shelley/genesis_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ var expectedGenesisObj = shelley.ShelleyGenesis{
137137
Type: common.NonceTypeNeutral,
138138
},
139139
ProtocolVersion: struct {
140-
Major uint
141-
Minor uint
140+
Major uint `json:"major"`
141+
Minor uint `json:"minor"`
142142
}{
143143
Major: 2,
144144
Minor: 0,

0 commit comments

Comments
 (0)