mirror of
https://github.com/luxfi/node.git
synced 2026-07-27 03:39:39 +00:00
External (HTTP / JSON-RPC) is the only place JSON is legitimate. Every
existing encoding/json import in node/ moves to github.com/go-json-experiment/json
(v2 root, not the v1 sub-package). NewEncoder/NewDecoder rewrite to
MarshalWrite/UnmarshalRead. MarshalIndent rewrites to Marshal with
jsontext.WithIndent. json.RawMessage rewrites to jsontext.Value.
*json.SyntaxError rewrites to *jsontext.SyntacticError.
81 files migrated. LLM.md captures the rule + v1->v2 delta table.
Known v2 semantic deltas surfaced by existing tests (followups, not regressions):
- [N]byte fields with no MarshalJSON now marshal as base64 string (v1 marshalled
as JSON array of byte numbers). Affects vms/platformvm/txs/*_test.go fixtures
with embedded BLS proofOfPossession.
- time.Duration has no v2 default representation; configs that wire-format
Duration as nanoseconds (vms/{xvm,platformvm}/config, config/spec) need to
switch to string-form Duration or carry an explicit option. v2 root does not
re-export FormatDurationAsNano.
- v2 enforces strict UTF-8 (vms/chainadapter/messaging fixture has non-UTF-8).
- json.MarshalWrite does not append a trailing '\n' (v1 NewEncoder.Encode did);
service/auth/auth_test.go expectation updated.
- nil []byte round-trips to empty (not nil); config_test deep-equal fixtures
surface this.
All affected sites are at the API boundary; ZAP wire envelope already covers
the internal data paths (state, P2P, consensus, MPC, threshold). Internal
JSON sites that should move to ZAP next (separate work):
- vms/da/store.go (DA blob/cert storage as JSON)
- vms/platformvm/airdrop (airdrop claims as JSON in db)
- vms/chainadapter/appchain (SQLite materializer schema/data blobs)
- vms/chainadapter/messaging (conversation codec)
- staking/kms.go (KMS HTTP client — external technically, leave)
- utils/{bimap,ips} (small marshaler shims — low priority)
178 lines
3.4 KiB
Go
178 lines
3.4 KiB
Go
// Copyright (C) 2019-2025, Lux Industries Inc. All rights reserved.
|
|
// See the file LICENSE for licensing terms.
|
|
|
|
|
|
package ips
|
|
|
|
import (
|
|
"github.com/go-json-experiment/json"
|
|
"net"
|
|
"strconv"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestIPPortEqual(t *testing.T) {
|
|
tests := []struct {
|
|
ipPort string
|
|
ipPort1 IPPort
|
|
ipPort2 IPPort
|
|
result bool
|
|
}{
|
|
// Expected equal
|
|
{
|
|
`"127.0.0.1:0"`,
|
|
IPPort{net.ParseIP("127.0.0.1"), 0},
|
|
IPPort{net.ParseIP("127.0.0.1"), 0},
|
|
true,
|
|
},
|
|
{
|
|
`"[::1]:0"`,
|
|
IPPort{net.ParseIP("::1"), 0},
|
|
IPPort{net.ParseIP("::1"), 0},
|
|
true,
|
|
},
|
|
{
|
|
`"127.0.0.1:0"`,
|
|
IPPort{net.ParseIP("127.0.0.1"), 0},
|
|
IPPort{net.ParseIP("::ffff:127.0.0.1"), 0},
|
|
true,
|
|
},
|
|
|
|
// Expected unequal
|
|
{
|
|
`"127.0.0.1:0"`,
|
|
IPPort{net.ParseIP("127.0.0.1"), 0},
|
|
IPPort{net.ParseIP("1.2.3.4"), 0},
|
|
false,
|
|
},
|
|
{
|
|
`"[::1]:0"`,
|
|
IPPort{net.ParseIP("::1"), 0},
|
|
IPPort{net.ParseIP("2001::1"), 0},
|
|
false,
|
|
},
|
|
{
|
|
`"127.0.0.1:0"`,
|
|
IPPort{net.ParseIP("127.0.0.1"), 0},
|
|
IPPort{net.ParseIP("127.0.0.1"), 1},
|
|
false,
|
|
},
|
|
}
|
|
for i, tt := range tests {
|
|
t.Run(strconv.Itoa(i), func(t *testing.T) {
|
|
require := require.New(t)
|
|
|
|
ipPort := IPDesc{}
|
|
require.NoError(ipPort.UnmarshalJSON([]byte(tt.ipPort)))
|
|
require.Equal(tt.ipPort1, IPPort(ipPort))
|
|
|
|
ipPortJSON, err := json.Marshal(ipPort)
|
|
require.NoError(err)
|
|
require.Equal(tt.ipPort, string(ipPortJSON))
|
|
|
|
require.Equal(tt.result, tt.ipPort1.Equal(tt.ipPort2))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIPPortString(t *testing.T) {
|
|
tests := []struct {
|
|
ipPort IPPort
|
|
result string
|
|
}{
|
|
{IPPort{net.ParseIP("127.0.0.1"), 0}, "127.0.0.1:0"},
|
|
{IPPort{net.ParseIP("::1"), 42}, "[::1]:42"},
|
|
{IPPort{net.ParseIP("::ffff:127.0.0.1"), 65535}, "127.0.0.1:65535"},
|
|
{IPPort{net.IP{}, 1234}, "<nil>:1234"},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.result, func(t *testing.T) {
|
|
require.Equal(t, tt.result, tt.ipPort.String())
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestToIPPortError(t *testing.T) {
|
|
tests := []struct {
|
|
in string
|
|
out IPPort
|
|
expectedErr error
|
|
}{
|
|
{
|
|
in: "",
|
|
out: IPPort{},
|
|
expectedErr: errBadIP,
|
|
},
|
|
{
|
|
in: ":",
|
|
out: IPPort{},
|
|
expectedErr: strconv.ErrSyntax,
|
|
},
|
|
{
|
|
in: "abc:",
|
|
out: IPPort{},
|
|
expectedErr: strconv.ErrSyntax,
|
|
},
|
|
{
|
|
in: ":abc",
|
|
out: IPPort{},
|
|
expectedErr: strconv.ErrSyntax,
|
|
},
|
|
{
|
|
in: "abc:abc",
|
|
out: IPPort{},
|
|
expectedErr: strconv.ErrSyntax,
|
|
},
|
|
{
|
|
in: "127.0.0.1:",
|
|
out: IPPort{},
|
|
expectedErr: strconv.ErrSyntax,
|
|
},
|
|
{
|
|
in: ":1",
|
|
out: IPPort{},
|
|
expectedErr: errBadIP,
|
|
},
|
|
{
|
|
in: "::1",
|
|
out: IPPort{},
|
|
expectedErr: errBadIP,
|
|
},
|
|
{
|
|
in: "::1:42",
|
|
out: IPPort{},
|
|
expectedErr: errBadIP,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.in, func(t *testing.T) {
|
|
require := require.New(t)
|
|
|
|
result, err := ToIPPort(tt.in)
|
|
require.ErrorIs(err, tt.expectedErr)
|
|
require.Equal(tt.out, result)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestToIPPort(t *testing.T) {
|
|
tests := []struct {
|
|
in string
|
|
out IPPort
|
|
}{
|
|
{"127.0.0.1:42", IPPort{net.ParseIP("127.0.0.1"), 42}},
|
|
{"[::1]:42", IPPort{net.ParseIP("::1"), 42}},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.in, func(t *testing.T) {
|
|
require := require.New(t)
|
|
|
|
result, err := ToIPPort(tt.in)
|
|
require.NoError(err)
|
|
require.Equal(tt.out, result)
|
|
})
|
|
}
|
|
}
|