diff --git a/chain/db.go b/chain/db.go index a864ca07..4d1c16d2 100644 --- a/chain/db.go +++ b/chain/db.go @@ -44,7 +44,6 @@ type versionedState struct { func (vs versionedState) EncodeTo(e *types.Encoder) { e.WriteUint8(2) vs.State.EncodeTo(e) - } func (vs *versionedState) DecodeFrom(d *types.Decoder) { diff --git a/chain/manager.go b/chain/manager.go index 4ac889f8..a2a87fd3 100644 --- a/chain/manager.go +++ b/chain/manager.go @@ -858,7 +858,7 @@ func (m *Manager) RecommendedFee() types.Currency { Mul64(estPoolWeight).Div64(targetWeight).Mul64(estPoolWeight). Div64(targetWeight).Mul64(estPoolWeight).Div64(targetWeight) - // finally, an absolute minumum fee: 1 SC / 100 KB + // finally, an absolute minimum fee: 1 SC / 100 KB minFee := types.Siacoins(1).Div64(100e3) // use the largest of all calculated fees diff --git a/consensus/state.go b/consensus/state.go index 8b7b822e..b7510b51 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -71,7 +71,7 @@ type Network struct { Height uint64 `json:"height"` OakTime time.Duration `json:"oakTime"` OakTarget types.BlockID `json:"oakTarget"` - } `json:"hardforkASIC"` + } `json:"hardforkAsic"` HardforkFoundation struct { Height uint64 `json:"height"` PrimaryAddress types.Address `json:"primaryAddress"` diff --git a/consensus/validation_test.go b/consensus/validation_test.go index 4ea35a0d..d1802531 100644 --- a/consensus/validation_test.go +++ b/consensus/validation_test.go @@ -1135,7 +1135,7 @@ func TestValidateV2Block(t *testing.T) { func(b *types.Block) { txn := &b.V2.Transactions[0] rev := testFces[0].V2FileContract - rev.RevisionNumber += 1 + rev.RevisionNumber++ txn.FileContractRevisions = []types.V2FileContractRevision{{ Parent: testFces[0], Revision: rev,