Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bevm sonarcloud cognitive complexity issues #2419

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix bevm sonarcloud cognitive complexity issues #2419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7da237
fix getInstrForEvent() cognitive complexity
cgrigis Dec 4, 2020
8b401db
fix handleLogs() cognitive complexity
cgrigis Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
202 changes: 115 additions & 87 deletions bevm/call_byzcoin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,120 +192,148 @@ func getArgs(eventArg interface{}) (byzcoin.Arguments, error) {
return args, nil
}

func getInstrForEvent(name string, eventData []interface{}) (
func getInstrForSpawnEvent(eventData []interface{}) (
*byzcoin.Instruction, error) {
var instr *byzcoin.Instruction
if len(eventData) != 3 {
return nil, xerrors.Errorf("invalid data for 'spawn' event: "+
"got %d values, expected 3", len(eventData))
}

switch name {
case byzcoinSpawnEvent:
if len(eventData) != 3 {
return nil, xerrors.Errorf("invalid data for 'spawn' event: "+
"got %d values, expected 3", len(eventData))
}
instanceID, err := get32Byte(eventData[0])
if err != nil {
return nil, xerrors.Errorf("invalid instanceID for 'spawn' event: "+
"%v", err)
}

instanceID, err := get32Byte(eventData[0])
if err != nil {
return nil, xerrors.Errorf("invalid instanceID for 'spawn' event: "+
"%v", err)
}
contractID, err := getString(eventData[1])
if err != nil {
return nil, xerrors.Errorf("invalid contractID for 'spawn' event: "+
"%v", err)
}

contractID, err := getString(eventData[1])
if err != nil {
return nil, xerrors.Errorf("invalid contractID for 'spawn' event: "+
"%v", err)
}
args, err := getArgs(eventData[2])
if err != nil {
return nil, xerrors.Errorf("invalid args for 'spawn' event: "+
"%v", err)
}

args, err := getArgs(eventData[2])
if err != nil {
return nil, xerrors.Errorf("invalid args for 'spawn' event: "+
"%v", err)
}
if !evmSpawnableContracts[contractID] {
return nil, xerrors.Errorf("contract '%s' has not been "+
"whitelisted to be spawned by an EVM contract",
contractID)
}

if !evmSpawnableContracts[contractID] {
return nil, xerrors.Errorf("contract '%s' has not been "+
"whitelisted to be spawned by an EVM contract",
contractID)
}
return &byzcoin.Instruction{
InstanceID: instanceID,
Spawn: &byzcoin.Spawn{
ContractID: contractID,
Args: args,
},
}, nil
}

instr = &byzcoin.Instruction{
InstanceID: instanceID,
Spawn: &byzcoin.Spawn{
ContractID: contractID,
Args: args,
},
}
func getInstrForInvokeEvent(eventData []interface{}) (
*byzcoin.Instruction, error) {
if len(eventData) != 4 {
return nil, xerrors.Errorf("invalid data for 'invoke' event: "+
"got %d values, expected 4", len(eventData))
}

case byzcoinInvokeEvent:
if len(eventData) != 4 {
return nil, xerrors.Errorf("invalid data for 'invoke' event: "+
"got %d values, expected 4", len(eventData))
}
instanceID, err := get32Byte(eventData[0])
if err != nil {
return nil, xerrors.Errorf("invalid instanceID for 'invoke' event: "+
"%v", err)
}

instanceID, err := get32Byte(eventData[0])
if err != nil {
return nil, xerrors.Errorf("invalid instanceID for 'invoke' event: "+
"%v", err)
}
contractID, err := getString(eventData[1])
if err != nil {
return nil, xerrors.Errorf("invalid contractID for 'invoke' event: "+
"%v", err)
}

contractID, err := getString(eventData[1])
if err != nil {
return nil, xerrors.Errorf("invalid contractID for 'invoke' event: "+
"%v", err)
}
command, err := getString(eventData[2])
if err != nil {
return nil, xerrors.Errorf("invalid command for 'invoke' event: "+
"%v", err)
}

command, err := getString(eventData[2])
if err != nil {
return nil, xerrors.Errorf("invalid command for 'invoke' event: "+
"%v", err)
}
args, err := getArgs(eventData[3])
if err != nil {
return nil, xerrors.Errorf("invalid args for 'invoke' event: "+
"%v", err)
}

args, err := getArgs(eventData[3])
if err != nil {
return nil, xerrors.Errorf("invalid args for 'invoke' event: "+
"%v", err)
}
return &byzcoin.Instruction{
InstanceID: instanceID,
Invoke: &byzcoin.Invoke{
ContractID: contractID,
Command: command,
Args: args,
},
}, nil
}

instr = &byzcoin.Instruction{
InstanceID: instanceID,
Invoke: &byzcoin.Invoke{
ContractID: contractID,
Command: command,
Args: args,
},
}
func getInstrForDeleteEvent(eventData []interface{}) (
*byzcoin.Instruction, error) {
if len(eventData) != 3 {
return nil, xerrors.Errorf("invalid data for 'delete' event: "+
"got %d values, expected 3", len(eventData))
}

case byzcoinDeleteEvent:
if len(eventData) != 3 {
return nil, xerrors.Errorf("invalid data for 'delete' event: "+
"got %d values, expected 3", len(eventData))
}
instanceID, err := get32Byte(eventData[0])
if err != nil {
return nil, xerrors.Errorf("invalid instanceID for 'delete' event: "+
"%v", err)
}

instanceID, err := get32Byte(eventData[0])
contractID, err := getString(eventData[1])
if err != nil {
return nil, xerrors.Errorf("invalid contractID for 'delete' event: "+
"%v", err)
}

args, err := getArgs(eventData[2])
if err != nil {
return nil, xerrors.Errorf("invalid args for 'delete' event: "+
"%v", err)
}

return &byzcoin.Instruction{
InstanceID: instanceID,
Delete: &byzcoin.Delete{
ContractID: contractID,
Args: args,
},
}, nil
}

func getInstrForEvent(name string, eventData []interface{}) (
*byzcoin.Instruction, error) {
var instr *byzcoin.Instruction
var err error

switch name {
case byzcoinSpawnEvent:
instr, err = getInstrForSpawnEvent(eventData)
if err != nil {
return nil, xerrors.Errorf("invalid instanceID for 'delete' event: "+
return nil, xerrors.Errorf("failed to handle 'spawn' event: "+
"%v", err)
}

contractID, err := getString(eventData[1])
case byzcoinInvokeEvent:
instr, err = getInstrForInvokeEvent(eventData)
if err != nil {
return nil, xerrors.Errorf("invalid contractID for 'delete' event: "+
return nil, xerrors.Errorf("failed to handle 'invoke' event: "+
"%v", err)
}

args, err := getArgs(eventData[2])
case byzcoinDeleteEvent:
instr, err = getInstrForDeleteEvent(eventData)
if err != nil {
return nil, xerrors.Errorf("invalid args for 'delete' event: "+
return nil, xerrors.Errorf("failed to handle 'delete' event: "+
"%v", err)
}

instr = &byzcoin.Instruction{
InstanceID: instanceID,
Delete: &byzcoin.Delete{
ContractID: contractID,
Args: args,
},
}

default:
return nil, xerrors.Errorf("internal error: event '%s' not handled",
name)
Expand Down
Loading