diff --git a/ledger/conway/pparams.go b/ledger/conway/pparams.go index 3296c337..643f0cdf 100644 --- a/ledger/conway/pparams.go +++ b/ledger/conway/pparams.go @@ -239,9 +239,9 @@ func (p *ConwayProtocolParameters) Update( } } -func (p *ConwayProtocolParameters) UpdateFromGenesis(genesis *ConwayGenesis) { +func (p *ConwayProtocolParameters) UpdateFromGenesis(genesis *ConwayGenesis) error { if genesis == nil { - return + return nil } p.MinCommitteeSize = genesis.MinCommitteeSize p.CommitteeTermLimit = genesis.CommitteeTermLimit @@ -335,6 +335,7 @@ func (p *ConwayProtocolParameters) UpdateFromGenesis(genesis *ConwayGenesis) { Rat: genesis.DRepVotingThresholds.TreasuryWithdrawal.Rat, } } + return nil } type ConwayProtocolParameterUpdate struct { diff --git a/ledger/conway/pparams_test.go b/ledger/conway/pparams_test.go index 72fc2f7e..3287dab4 100644 --- a/ledger/conway/pparams_test.go +++ b/ledger/conway/pparams_test.go @@ -463,7 +463,9 @@ func TestConwayProtocolParamsUpdateFromGenesis(t *testing.T) { t.Fatalf("unexpected error: %s", err) } tmpParams := testDef.startParams - tmpParams.UpdateFromGenesis(&tmpGenesis) + if err := tmpParams.UpdateFromGenesis(&tmpGenesis); err != nil { + t.Fatalf("unexpected error updating pparams from genesis: %s", err) + } if !reflect.DeepEqual(tmpParams, testDef.expectedParams) { t.Fatalf( "did not get expected params:\n got: %#v\n wanted: %#v", diff --git a/ledger/shelley/pparams.go b/ledger/shelley/pparams.go index ce54ace2..f2dceb84 100644 --- a/ledger/shelley/pparams.go +++ b/ledger/shelley/pparams.go @@ -98,9 +98,9 @@ func (p *ShelleyProtocolParameters) Update( } } -func (p *ShelleyProtocolParameters) UpdateFromGenesis(genesis *ShelleyGenesis) { +func (p *ShelleyProtocolParameters) UpdateFromGenesis(genesis *ShelleyGenesis) error { if genesis == nil { - return + return nil } genesisParams := genesis.ProtocolParameters p.MinFeeA = genesisParams.MinFeeA @@ -130,6 +130,7 @@ func (p *ShelleyProtocolParameters) UpdateFromGenesis(genesis *ShelleyGenesis) { p.ProtocolMajor = genesisParams.ProtocolVersion.Major p.ProtocolMinor = genesisParams.ProtocolVersion.Minor p.MinUtxoValue = genesisParams.MinUtxoValue + return nil } type ShelleyProtocolParameterUpdate struct { diff --git a/ledger/shelley/pparams_test.go b/ledger/shelley/pparams_test.go index 2bba89f0..2f78db81 100644 --- a/ledger/shelley/pparams_test.go +++ b/ledger/shelley/pparams_test.go @@ -95,7 +95,9 @@ func TestShelleyProtocolParamsUpdateFromGenesis(t *testing.T) { t.Fatalf("unexpected error: %s", err) } tmpParams := testDef.startParams - tmpParams.UpdateFromGenesis(&tmpGenesis) + if err := tmpParams.UpdateFromGenesis(&tmpGenesis); err != nil { + t.Fatalf("unexpected error updating pparams from genesis: %s", err) + } if !reflect.DeepEqual(tmpParams, testDef.expectedParams) { t.Fatalf( "did not get expected params:\n got: %#v\n wanted: %#v",