TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "rpc: marshal GAS in getunclaimedgas as decimal"

Browse source 
This reverts commit df801a8539.
This commit is contained in:
Evgeniy Stratonikov 2021-02-09 11:37:25 +03:00
parent b0fbd897ad
commit 18911caa3a
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/rpc/client/rpc_test.go
View file

@ -657,7 +657,7 @@ var rpcClientTestCases = map[string][]rpcClientTestCase{
invoke: func(c *Client) (interface{}, error) { invoke: func(c *Client) (interface{}, error) {
return c.GetUnclaimedGas("NMipL5VsNoLUBUJKPKLhxaEbPQVCZnyJyB") return c.GetUnclaimedGas("NMipL5VsNoLUBUJKPKLhxaEbPQVCZnyJyB")
}, },
serverResponse: `{"jsonrpc":"2.0","id":1,"result":{"address":"NMipL5VsNoLUBUJKPKLhxaEbPQVCZnyJyB","unclaimed":"8972.99680935"}}`, serverResponse: `{"jsonrpc":"2.0","id":1,"result":{"address":"NMipL5VsNoLUBUJKPKLhxaEbPQVCZnyJyB","unclaimed":"897299680935"}}`,
result: func(c *Client) interface{} { result: func(c *Client) interface{} {
addr, err := address.StringToUint160("NMipL5VsNoLUBUJKPKLhxaEbPQVCZnyJyB") addr, err := address.StringToUint160("NMipL5VsNoLUBUJKPKLhxaEbPQVCZnyJyB")
if err != nil { if err != nil {

11
pkg/rpc/response/result/unclaimed_gas.go
View file

@ -2,11 +2,10 @@ package result
import ( import (
"encoding/json" "encoding/json"
"fmt" "errors"
"math/big" "math/big"
"github.com/nspcc-dev/neo-go/pkg/encoding/address" "github.com/nspcc-dev/neo-go/pkg/encoding/address"
"github.com/nspcc-dev/neo-go/pkg/encoding/fixedn"
"github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/util"
) )
@ -26,7 +25,7 @@ type unclaimedGas struct {
func (g UnclaimedGas) MarshalJSON() ([]byte, error) { func (g UnclaimedGas) MarshalJSON() ([]byte, error) {
gas := &unclaimedGas{ gas := &unclaimedGas{
Address: address.Uint160ToString(g.Address), Address: address.Uint160ToString(g.Address),
Unclaimed: fixedn.ToString(&g.Unclaimed, 8), Unclaimed: g.Unclaimed.String(),
} }
return json.Marshal(gas) return json.Marshal(gas)
} }
@ -37,9 +36,9 @@ func (g *UnclaimedGas) UnmarshalJSON(data []byte) error {
if err := json.Unmarshal(data, gas); err != nil { if err := json.Unmarshal(data, gas); err != nil {
return err return err
} }
uncl, err := fixedn.FromString(gas.Unclaimed, 8) uncl, ok := new(big.Int).SetString(gas.Unclaimed, 10)
if err != nil { if !ok {
return fmt.Errorf("failed to convert unclaimed gas: %w", err) return errors.New("failed to convert unclaimed gas")
} }
g.Unclaimed = *uncl g.Unclaimed = *uncl
addr, err := address.StringToUint160(gas.Address) addr, err := address.StringToUint160(gas.Address)