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

refactor: renames

Browse Source
This commit is contained in:
Alan Shaw 2020-09-15 15:47:11 +01:00
parent dfaad08a8b
commit c1a9cf7edd
No known key found for this signature in database
GPG Key ID: 731D1C308A48A6B9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
conformance/chaos/actor.go
View File

@ -33,10 +33,10 @@ const (
CallerValidationBranchNone CallerValidationBranch = iota CallerValidationBranchNone CallerValidationBranch = iota
// CallerValidationBranchTwice causes Runtime.ValidateImmediateCallerAcceptAny to be called twice. // CallerValidationBranchTwice causes Runtime.ValidateImmediateCallerAcceptAny to be called twice.
CallerValidationBranchTwice CallerValidationBranchTwice
// CallerValidationBranchIs causes caller validation against CallerValidationArgs.Addrs. // CallerValidationBranchIsAddress causes caller validation against CallerValidationArgs.Addrs.
CallerValidationBranchIs CallerValidationBranchIsAddress
// CallerValidationBranchType causes caller validation against CallerValidationArgs.Types. // CallerValidationBranchIsType causes caller validation against CallerValidationArgs.Types.
CallerValidationBranchType CallerValidationBranchIsType
) )
// MutateStateBranch is an enum used to select the type of state mutation to attempt. // MutateStateBranch is an enum used to select the type of state mutation to attempt.
@ -136,17 +136,17 @@ type CallerValidationArgs struct {
// //
// CallerValidationBranchNone performs no validation. // CallerValidationBranchNone performs no validation.
// CallerValidationBranchTwice validates twice. // CallerValidationBranchTwice validates twice.
// CallerValidationBranchIs validates caller against CallerValidationArgs.Addrs. // CallerValidationBranchIsAddress validates caller against CallerValidationArgs.Addrs.
// CallerValidationBranchType validates caller against CallerValidationArgs.Types. // CallerValidationBranchIsType validates caller against CallerValidationArgs.Types.
func (a Actor) CallerValidation(rt runtime.Runtime, args *CallerValidationArgs) *abi.EmptyValue { func (a Actor) CallerValidation(rt runtime.Runtime, args *CallerValidationArgs) *abi.EmptyValue {
switch args.Branch { switch args.Branch {
case CallerValidationBranchNone: case CallerValidationBranchNone:
case CallerValidationBranchTwice: case CallerValidationBranchTwice:
rt.ValidateImmediateCallerAcceptAny() rt.ValidateImmediateCallerAcceptAny()
rt.ValidateImmediateCallerAcceptAny() rt.ValidateImmediateCallerAcceptAny()
case CallerValidationBranchIs: case CallerValidationBranchIsAddress:
rt.ValidateImmediateCallerIs(args.Addrs...) rt.ValidateImmediateCallerIs(args.Addrs...)
case CallerValidationBranchType: case CallerValidationBranchIsType:
rt.ValidateImmediateCallerType(args.Types...) rt.ValidateImmediateCallerType(args.Types...)
default: default:
panic("invalid branch passed to CallerValidation") panic("invalid branch passed to CallerValidation")

8
conformance/chaos/actor_test.go
View File

@ -53,7 +53,7 @@ func TestCallerValidationIs(t *testing.T) {
// FIXME: https://github.com/filecoin-project/specs-actors/pull/1155 // FIXME: https://github.com/filecoin-project/specs-actors/pull/1155
rt.ExpectAbort(exitcode.ErrForbidden, func() { rt.ExpectAbort(exitcode.ErrForbidden, func() {
rt.Call(a.CallerValidation, &CallerValidationArgs{ rt.Call(a.CallerValidation, &CallerValidationArgs{
Branch: CallerValidationBranchIs, Branch: CallerValidationBranchIsAddress,
Addrs: caddrs, Addrs: caddrs,
}) })
}) })
@ -61,7 +61,7 @@ func TestCallerValidationIs(t *testing.T) {
rt.ExpectValidateCallerAddr(caller) rt.ExpectValidateCallerAddr(caller)
rt.Call(a.CallerValidation, &CallerValidationArgs{ rt.Call(a.CallerValidation, &CallerValidationArgs{
Branch: CallerValidationBranchIs, Branch: CallerValidationBranchIsAddress,
Addrs: []address.Address{caller}, Addrs: []address.Address{caller},
}) })
rt.Verify() rt.Verify()
@ -80,7 +80,7 @@ func TestCallerValidationType(t *testing.T) {
// FIXME: https://github.com/filecoin-project/specs-actors/pull/1155 // FIXME: https://github.com/filecoin-project/specs-actors/pull/1155
rt.ExpectAbort(exitcode.ErrForbidden, func() { rt.ExpectAbort(exitcode.ErrForbidden, func() {
rt.Call(a.CallerValidation, &CallerValidationArgs{ rt.Call(a.CallerValidation, &CallerValidationArgs{
Branch: CallerValidationBranchType, Branch: CallerValidationBranchIsType,
Types: []cid.Cid{builtin.CronActorCodeID}, Types: []cid.Cid{builtin.CronActorCodeID},
}) })
}) })
@ -88,7 +88,7 @@ func TestCallerValidationType(t *testing.T) {
rt.ExpectValidateCallerType(builtin.AccountActorCodeID) rt.ExpectValidateCallerType(builtin.AccountActorCodeID)
rt.Call(a.CallerValidation, &CallerValidationArgs{ rt.Call(a.CallerValidation, &CallerValidationArgs{
Branch: CallerValidationBranchType, Branch: CallerValidationBranchIsType,
Types: []cid.Cid{builtin.AccountActorCodeID}, Types: []cid.Cid{builtin.AccountActorCodeID},
}) })
rt.Verify() rt.Verify()