cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #932 from filecoin-project/feat/cfg-uncomment-sections

Browse Source 
config: Don't comment sections be default
This commit is contained in:
Jakub Sztandera 2019-12-16 13:03:45 +01:00 committed by GitHub
commit c25f616562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chain/validation/message.go
View File

@ -83,14 +83,14 @@ var methods = []uint64{
vchain.StorageMinerGetPeerID: actors.MAMethods.GetPeerID, vchain.StorageMinerGetPeerID: actors.MAMethods.GetPeerID,
vchain.StorageMinerGetSectorSize: actors.MAMethods.GetSectorSize, vchain.StorageMinerGetSectorSize: actors.MAMethods.GetSectorSize,
vchain.MultiSigConstructor: actors.MultiSigMethods.MultiSigConstructor, vchain.MultiSigConstructor: actors.MultiSigMethods.MultiSigConstructor,
vchain.MultiSigPropose: actors.MultiSigMethods.Propose, vchain.MultiSigPropose: actors.MultiSigMethods.Propose,
vchain.MultiSigApprove: actors.MultiSigMethods.Approve, vchain.MultiSigApprove: actors.MultiSigMethods.Approve,
vchain.MultiSigCancel: actors.MultiSigMethods.Cancel, vchain.MultiSigCancel: actors.MultiSigMethods.Cancel,
vchain.MultiSigClearCompleted: actors.MultiSigMethods.ClearCompleted, vchain.MultiSigClearCompleted: actors.MultiSigMethods.ClearCompleted,
vchain.MultiSigAddSigner: actors.MultiSigMethods.AddSigner, vchain.MultiSigAddSigner: actors.MultiSigMethods.AddSigner,
vchain.MultiSigRemoveSigner: actors.MultiSigMethods.RemoveSigner, vchain.MultiSigRemoveSigner: actors.MultiSigMethods.RemoveSigner,
vchain.MultiSigSwapSigner: actors.MultiSigMethods.SwapSigner, vchain.MultiSigSwapSigner: actors.MultiSigMethods.SwapSigner,
vchain.MultiSigChangeRequirement: actors.MultiSigMethods.ChangeRequirement, vchain.MultiSigChangeRequirement: actors.MultiSigMethods.ChangeRequirement,
// More to follow... // More to follow...
} }

2
chain/vm/validation_test.go
View File

@ -32,4 +32,4 @@ func TestMultiSig(t *testing.T) {
suites.MultiSigActorConstructor(t, factory) suites.MultiSigActorConstructor(t, factory)
suites.MultiSigActorProposeApprove(t, factory) suites.MultiSigActorProposeApprove(t, factory)
suites.MultiSigActorProposeCancel(t, factory) suites.MultiSigActorProposeCancel(t, factory)
} }

2
cmd/lotus-chainwatch/storage.go
View File

@ -327,7 +327,7 @@ func (st *storage) storeHeaders(bhs map[cid.Cid]*types.BlockHeader, sync bool) e
bh.EPostProof.Candidates[0].Partial, bh.EPostProof.Candidates[0].Partial,
bh.EPostProof.Candidates[0].SectorID, bh.EPostProof.Candidates[0].SectorID,
bh.EPostProof.Candidates[0].ChallengeIndex, bh.EPostProof.Candidates[0].ChallengeIndex,
); err != nil { ); err != nil {
return err return err
} }
} }

1
node/config/load.go
View File

@ -44,6 +44,7 @@ func ConfigComment(t interface{}) ([]byte, error) {
} }
b := buf.Bytes() b := buf.Bytes()
b = bytes.ReplaceAll(b, []byte("\n"), []byte("\n#")) b = bytes.ReplaceAll(b, []byte("\n"), []byte("\n#"))
b = bytes.ReplaceAll(b, []byte("#["), []byte("["))
return b, nil return b, nil
} }