Skip to content

Commit 23fe1a7

Browse files
authored
refactor: return error from UpdateFromGenesis for consistency (#1031)
Signed-off-by: Aurora Gaffney <[email protected]>
1 parent 348f4ef commit 23fe1a7

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

ledger/conway/pparams.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ func (p *ConwayProtocolParameters) Update(
239239
}
240240
}
241241

242-
func (p *ConwayProtocolParameters) UpdateFromGenesis(genesis *ConwayGenesis) {
242+
func (p *ConwayProtocolParameters) UpdateFromGenesis(genesis *ConwayGenesis) error {
243243
if genesis == nil {
244-
return
244+
return nil
245245
}
246246
p.MinCommitteeSize = genesis.MinCommitteeSize
247247
p.CommitteeTermLimit = genesis.CommitteeTermLimit
@@ -335,6 +335,7 @@ func (p *ConwayProtocolParameters) UpdateFromGenesis(genesis *ConwayGenesis) {
335335
Rat: genesis.DRepVotingThresholds.TreasuryWithdrawal.Rat,
336336
}
337337
}
338+
return nil
338339
}
339340

340341
type ConwayProtocolParameterUpdate struct {

ledger/conway/pparams_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,9 @@ func TestConwayProtocolParamsUpdateFromGenesis(t *testing.T) {
466466
t.Fatalf("unexpected error: %s", err)
467467
}
468468
tmpParams := testDef.startParams
469-
tmpParams.UpdateFromGenesis(&tmpGenesis)
469+
if err := tmpParams.UpdateFromGenesis(&tmpGenesis); err != nil {
470+
t.Fatalf("unexpected error updating pparams from genesis: %s", err)
471+
}
470472
if !reflect.DeepEqual(tmpParams, testDef.expectedParams) {
471473
t.Fatalf(
472474
"did not get expected params:\n got: %#v\n wanted: %#v",

ledger/shelley/pparams.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ func (p *ShelleyProtocolParameters) Update(
9898
}
9999
}
100100

101-
func (p *ShelleyProtocolParameters) UpdateFromGenesis(genesis *ShelleyGenesis) {
101+
func (p *ShelleyProtocolParameters) UpdateFromGenesis(genesis *ShelleyGenesis) error {
102102
if genesis == nil {
103-
return
103+
return nil
104104
}
105105
genesisParams := genesis.ProtocolParameters
106106
p.MinFeeA = genesisParams.MinFeeA
@@ -130,6 +130,7 @@ func (p *ShelleyProtocolParameters) UpdateFromGenesis(genesis *ShelleyGenesis) {
130130
p.ProtocolMajor = genesisParams.ProtocolVersion.Major
131131
p.ProtocolMinor = genesisParams.ProtocolVersion.Minor
132132
p.MinUtxoValue = genesisParams.MinUtxoValue
133+
return nil
133134
}
134135

135136
type ShelleyProtocolParameterUpdate struct {

ledger/shelley/pparams_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ func TestShelleyProtocolParamsUpdateFromGenesis(t *testing.T) {
9595
t.Fatalf("unexpected error: %s", err)
9696
}
9797
tmpParams := testDef.startParams
98-
tmpParams.UpdateFromGenesis(&tmpGenesis)
98+
if err := tmpParams.UpdateFromGenesis(&tmpGenesis); err != nil {
99+
t.Fatalf("unexpected error updating pparams from genesis: %s", err)
100+
}
99101
if !reflect.DeepEqual(tmpParams, testDef.expectedParams) {
100102
t.Fatalf(
101103
"did not get expected params:\n got: %#v\n wanted: %#v",

0 commit comments

Comments
 (0)