diff options
author | Felix Lange <fjl@users.noreply.github.com> | 2018-01-08 21:13:22 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2018-01-08 21:13:22 +0800 |
commit | 9d06026c1991fdd8f034ce194fa20a0740c21810 (patch) | |
tree | 8625b7c087dfcd8cf8f087113c7242cf0d7639cd /tests | |
parent | 5c2f1e00148f16655d3fb63b93920b1108165c56 (diff) | |
download | go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.gz go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.bz2 go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.lz go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.xz go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.zst go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.zip |
all: regenerate codecs with gencodec commit 90983d99de (#15830)
Fixes #15777 because null is now allowed for hexutil.Bytes.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gen_btheader.go | 4 | ||||
-rw-r--r-- | tests/gen_sttransaction.go | 4 | ||||
-rw-r--r-- | tests/gen_tttransaction.go | 4 | ||||
-rw-r--r-- | tests/gen_vmexec.go | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 1e25765c4..5cfd4bd0a 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -66,7 +66,7 @@ func (b *btHeader) UnmarshalJSON(input []byte) error { StateRoot *common.Hash TransactionsTrie *common.Hash UncleHash *common.Hash - ExtraData hexutil.Bytes + ExtraData *hexutil.Bytes Difficulty *math.HexOrDecimal256 GasLimit *math.HexOrDecimal64 GasUsed *math.HexOrDecimal64 @@ -110,7 +110,7 @@ func (b *btHeader) UnmarshalJSON(input []byte) error { b.UncleHash = *dec.UncleHash } if dec.ExtraData != nil { - b.ExtraData = dec.ExtraData + b.ExtraData = *dec.ExtraData } if dec.Difficulty != nil { b.Difficulty = (*big.Int)(dec.Difficulty) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 5a489d00b..451ffcbf4 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -46,7 +46,7 @@ func (s *stTransaction) UnmarshalJSON(input []byte) error { Data []string `json:"data"` GasLimit []math.HexOrDecimal64 `json:"gasLimit"` Value []string `json:"value"` - PrivateKey hexutil.Bytes `json:"secretKey"` + PrivateKey *hexutil.Bytes `json:"secretKey"` } var dec stTransaction if err := json.Unmarshal(input, &dec); err != nil { @@ -74,7 +74,7 @@ func (s *stTransaction) UnmarshalJSON(input []byte) error { s.Value = dec.Value } if dec.PrivateKey != nil { - s.PrivateKey = dec.PrivateKey + s.PrivateKey = *dec.PrivateKey } return nil } diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index dfdb042fc..2948842d9 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -41,7 +41,7 @@ func (t ttTransaction) MarshalJSON() ([]byte, error) { func (t *ttTransaction) UnmarshalJSON(input []byte) error { type ttTransaction struct { - Data hexutil.Bytes `gencodec:"required"` + Data *hexutil.Bytes `gencodec:"required"` GasLimit *math.HexOrDecimal64 `gencodec:"required"` GasPrice *math.HexOrDecimal256 `gencodec:"required"` Nonce *math.HexOrDecimal64 `gencodec:"required"` @@ -58,7 +58,7 @@ func (t *ttTransaction) UnmarshalJSON(input []byte) error { if dec.Data == nil { return errors.New("missing required field 'data' for ttTransaction") } - t.Data = dec.Data + t.Data = *dec.Data if dec.GasLimit == nil { return errors.New("missing required field 'gasLimit' for ttTransaction") } diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index dd2d3d94e..a5f01cf45 100644 --- a/tests/gen_vmexec.go +++ b/tests/gen_vmexec.go @@ -42,8 +42,8 @@ func (v *vmExec) UnmarshalJSON(input []byte) error { Address *common.UnprefixedAddress `json:"address" gencodec:"required"` Caller *common.UnprefixedAddress `json:"caller" gencodec:"required"` Origin *common.UnprefixedAddress `json:"origin" gencodec:"required"` - Code hexutil.Bytes `json:"code" gencodec:"required"` - Data hexutil.Bytes `json:"data" gencodec:"required"` + Code *hexutil.Bytes `json:"code" gencodec:"required"` + Data *hexutil.Bytes `json:"data" gencodec:"required"` Value *math.HexOrDecimal256 `json:"value" gencodec:"required"` GasLimit *math.HexOrDecimal64 `json:"gas" gencodec:"required"` GasPrice *math.HexOrDecimal256 `json:"gasPrice" gencodec:"required"` @@ -67,11 +67,11 @@ func (v *vmExec) UnmarshalJSON(input []byte) error { if dec.Code == nil { return errors.New("missing required field 'code' for vmExec") } - v.Code = dec.Code + v.Code = *dec.Code if dec.Data == nil { return errors.New("missing required field 'data' for vmExec") } - v.Data = dec.Data + v.Data = *dec.Data if dec.Value == nil { return errors.New("missing required field 'value' for vmExec") } |