Skip to content

Commit

Permalink
adjust code to API changes in cadence package
Browse files Browse the repository at this point in the history
  • Loading branch information
turbolent committed May 2, 2024
1 parent 5997f8f commit 75655ff
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
19 changes: 6 additions & 13 deletions internal/accounts/staking-info.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ func envFromNetwork(network flowsdk.ChainID) tmpl.Environment {
}

func nodeIDToString(value any) string {
return value.(cadence.String).ToGoValue().(string)
return string(value.(cadence.String))
}

func newStakingInfoFromValue(value cadence.Value) ([]map[string]any, error) {
stakingInfo := make([]map[string]any, 0)
func newStakingInfoFromValue(value cadence.Value) ([]map[string]cadence.Value, error) {
stakingInfo := make([]map[string]cadence.Value, 0)
arrayValue, ok := value.(cadence.Array)
if !ok {
return stakingInfo, fmt.Errorf("staking info must be a cadence array")
Expand All @@ -191,23 +191,16 @@ func newStakingInfoFromValue(value cadence.Value) ([]map[string]any, error) {
return stakingInfo, fmt.Errorf("staking info must be a cadence array of structs")
}

keys := make([]string, 0)
values := make(map[string]any)
for _, field := range vs.StructType.Fields {
keys = append(keys, field.Identifier)
}
for j, value := range vs.Fields {
values[keys[j]] = value
}
values := cadence.FieldsMappedByName(vs)
stakingInfo = append(stakingInfo, values)
}

return stakingInfo, nil
}

type stakingResult struct {
staking []map[string]any // stake as FlowIDTableStaking.NodeInfo
delegation []map[string]any // delegation as FlowIDTableStaking.DelegatorInfo
staking []map[string]cadence.Value // stake as FlowIDTableStaking.NodeInfo
delegation []map[string]cadence.Value // delegation as FlowIDTableStaking.DelegatorInfo
}

func (r *stakingResult) JSON() any {
Expand Down
6 changes: 4 additions & 2 deletions internal/events/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,10 @@ func eventString(writer io.Writer, event flow.Event) {
_, _ = fmt.Fprintf(writer, " Tx ID\t%s\n", event.TransactionID)
_, _ = fmt.Fprintf(writer, " Values\n")

for i, field := range event.Value.EventType.Fields {
value := event.Value.Fields[i]
fields := cadence.FieldsMappedByName(event.Value)

for _, field := range event.Value.EventType.Fields {
value := fields[field.Identifier]
printField(writer, field, value)
}
}
Expand Down

0 comments on commit 75655ff

Please sign in to comment.