From 18c0b0a65b62880ba1268d0a33b095b44517e84d Mon Sep 17 00:00:00 2001 From: Dan Laine Date: Mon, 15 Jun 2020 13:20:30 -0400 Subject: [PATCH] move codec to utils --- api/keystore/service.go | 2 +- chains/atomic/memory.go | 2 +- database/encdb/db.go | 2 +- genesis/genesis.go | 2 +- {vms/components => utils}/codec/codec.go | 0 {vms/components => utils}/codec/codec_benchmark_test.go | 0 {vms/components => utils}/codec/codec_test.go | 0 vms/avm/base_tx.go | 2 +- vms/avm/create_asset_tx.go | 2 +- vms/avm/create_asset_tx_test.go | 2 +- vms/avm/export_tx.go | 2 +- vms/avm/export_tx_test.go | 2 +- vms/avm/import_tx.go | 2 +- vms/avm/initial_state.go | 2 +- vms/avm/initial_state_test.go | 2 +- vms/avm/operation.go | 2 +- vms/avm/operation_test.go | 2 +- vms/avm/operation_tx.go | 2 +- vms/avm/static_service.go | 2 +- vms/avm/tx.go | 2 +- vms/avm/tx_test.go | 2 +- vms/avm/vm.go | 2 +- vms/components/ava/asset_test.go | 2 +- vms/components/ava/prefixed_state.go | 2 +- vms/components/ava/prefixed_state_test.go | 2 +- vms/components/ava/state.go | 2 +- vms/components/ava/transferables.go | 2 +- vms/components/ava/transferables_test.go | 2 +- vms/components/ava/utxo_id_test.go | 2 +- vms/components/ava/utxo_test.go | 2 +- vms/nftfx/fx_test.go | 2 +- vms/platformvm/vm.go | 2 +- vms/propertyfx/fx_test.go | 2 +- vms/secp256k1fx/credential_test.go | 2 +- vms/secp256k1fx/fx_test.go | 2 +- vms/secp256k1fx/transer_input_test.go | 2 +- vms/secp256k1fx/transfer_output_test.go | 2 +- vms/secp256k1fx/vm.go | 2 +- vms/timestampvm/vm.go | 2 +- xputtest/avmwallet/wallet.go | 2 +- 40 files changed, 37 insertions(+), 37 deletions(-) rename {vms/components => utils}/codec/codec.go (100%) rename {vms/components => utils}/codec/codec_benchmark_test.go (100%) rename {vms/components => utils}/codec/codec_test.go (100%) diff --git a/api/keystore/service.go b/api/keystore/service.go index 16aca06..25e9a02 100644 --- a/api/keystore/service.go +++ b/api/keystore/service.go @@ -19,7 +19,7 @@ import ( "github.com/ava-labs/gecko/snow/engine/common" "github.com/ava-labs/gecko/utils/formatting" "github.com/ava-labs/gecko/utils/logging" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" jsoncodec "github.com/ava-labs/gecko/utils/json" zxcvbn "github.com/nbutton23/zxcvbn-go" diff --git a/chains/atomic/memory.go b/chains/atomic/memory.go index 448e6c9..9774711 100644 --- a/chains/atomic/memory.go +++ b/chains/atomic/memory.go @@ -12,7 +12,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/utils/hashing" "github.com/ava-labs/gecko/utils/logging" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) type rcLock struct { diff --git a/database/encdb/db.go b/database/encdb/db.go index eb06549..4814805 100644 --- a/database/encdb/db.go +++ b/database/encdb/db.go @@ -14,7 +14,7 @@ import ( "github.com/ava-labs/gecko/database/nodb" "github.com/ava-labs/gecko/utils" "github.com/ava-labs/gecko/utils/hashing" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) // Database encrypts all values that are provided diff --git a/genesis/genesis.go b/genesis/genesis.go index 4cad047..c4245b9 100644 --- a/genesis/genesis.go +++ b/genesis/genesis.go @@ -14,7 +14,7 @@ import ( "github.com/ava-labs/gecko/utils/units" "github.com/ava-labs/gecko/utils/wrappers" "github.com/ava-labs/gecko/vms/avm" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/nftfx" "github.com/ava-labs/gecko/vms/platformvm" "github.com/ava-labs/gecko/vms/propertyfx" diff --git a/vms/components/codec/codec.go b/utils/codec/codec.go similarity index 100% rename from vms/components/codec/codec.go rename to utils/codec/codec.go diff --git a/vms/components/codec/codec_benchmark_test.go b/utils/codec/codec_benchmark_test.go similarity index 100% rename from vms/components/codec/codec_benchmark_test.go rename to utils/codec/codec_benchmark_test.go diff --git a/vms/components/codec/codec_test.go b/utils/codec/codec_test.go similarity index 100% rename from vms/components/codec/codec_test.go rename to utils/codec/codec_test.go diff --git a/vms/avm/base_tx.go b/vms/avm/base_tx.go index 33cba51..0ab3fa4 100644 --- a/vms/avm/base_tx.go +++ b/vms/avm/base_tx.go @@ -10,7 +10,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/snow" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" ) diff --git a/vms/avm/create_asset_tx.go b/vms/avm/create_asset_tx.go index 9f95a15..77aae2f 100644 --- a/vms/avm/create_asset_tx.go +++ b/vms/avm/create_asset_tx.go @@ -11,7 +11,7 @@ import ( "github.com/ava-labs/gecko/snow" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) const ( diff --git a/vms/avm/create_asset_tx_test.go b/vms/avm/create_asset_tx_test.go index a26a815..324f403 100644 --- a/vms/avm/create_asset_tx_test.go +++ b/vms/avm/create_asset_tx_test.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" "github.com/ava-labs/gecko/vms/secp256k1fx" ) diff --git a/vms/avm/export_tx.go b/vms/avm/export_tx.go index d5222f4..d788360 100644 --- a/vms/avm/export_tx.go +++ b/vms/avm/export_tx.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/database/versiondb" "github.com/ava-labs/gecko/snow" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" ) diff --git a/vms/avm/export_tx_test.go b/vms/avm/export_tx_test.go index 4e9d064..fdef399 100644 --- a/vms/avm/export_tx_test.go +++ b/vms/avm/export_tx_test.go @@ -16,7 +16,7 @@ import ( "github.com/ava-labs/gecko/utils/hashing" "github.com/ava-labs/gecko/utils/logging" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/secp256k1fx" ) diff --git a/vms/avm/import_tx.go b/vms/avm/import_tx.go index 09dec6e..1729221 100644 --- a/vms/avm/import_tx.go +++ b/vms/avm/import_tx.go @@ -12,7 +12,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/snow" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" ) diff --git a/vms/avm/initial_state.go b/vms/avm/initial_state.go index c3d4b16..73ad6e4 100644 --- a/vms/avm/initial_state.go +++ b/vms/avm/initial_state.go @@ -8,7 +8,7 @@ import ( "errors" "sort" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" ) diff --git a/vms/avm/initial_state_test.go b/vms/avm/initial_state_test.go index 67c4b15..b61876c 100644 --- a/vms/avm/initial_state_test.go +++ b/vms/avm/initial_state_test.go @@ -11,7 +11,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/utils/formatting" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" "github.com/ava-labs/gecko/vms/secp256k1fx" ) diff --git a/vms/avm/operation.go b/vms/avm/operation.go index 3b5fc9a..ef9317b 100644 --- a/vms/avm/operation.go +++ b/vms/avm/operation.go @@ -10,7 +10,7 @@ import ( "github.com/ava-labs/gecko/utils" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" ) diff --git a/vms/avm/operation_test.go b/vms/avm/operation_test.go index 8948388..8b85901 100644 --- a/vms/avm/operation_test.go +++ b/vms/avm/operation_test.go @@ -8,7 +8,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" ) diff --git a/vms/avm/operation_tx.go b/vms/avm/operation_tx.go index 9384f8d..ec419c7 100644 --- a/vms/avm/operation_tx.go +++ b/vms/avm/operation_tx.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/snow" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" ) diff --git a/vms/avm/static_service.go b/vms/avm/static_service.go index 3fd58f3..48b58a9 100644 --- a/vms/avm/static_service.go +++ b/vms/avm/static_service.go @@ -11,7 +11,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/utils/formatting" "github.com/ava-labs/gecko/utils/wrappers" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/secp256k1fx" cjson "github.com/ava-labs/gecko/utils/json" diff --git a/vms/avm/tx.go b/vms/avm/tx.go index c35fd80..f1d0b71 100644 --- a/vms/avm/tx.go +++ b/vms/avm/tx.go @@ -10,7 +10,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/snow" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" ) diff --git a/vms/avm/tx_test.go b/vms/avm/tx_test.go index 2f269e9..53e20de 100644 --- a/vms/avm/tx_test.go +++ b/vms/avm/tx_test.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/utils/units" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" "github.com/ava-labs/gecko/vms/secp256k1fx" ) diff --git a/vms/avm/vm.go b/vms/avm/vm.go index b7f7252..4c0820d 100644 --- a/vms/avm/vm.go +++ b/vms/avm/vm.go @@ -25,7 +25,7 @@ import ( "github.com/ava-labs/gecko/utils/timer" "github.com/ava-labs/gecko/utils/wrappers" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" cjson "github.com/ava-labs/gecko/utils/json" ) diff --git a/vms/components/ava/asset_test.go b/vms/components/ava/asset_test.go index 40d6ea8..79ae7d5 100644 --- a/vms/components/ava/asset_test.go +++ b/vms/components/ava/asset_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/ava-labs/gecko/ids" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) func TestAssetVerifyNil(t *testing.T) { diff --git a/vms/components/ava/prefixed_state.go b/vms/components/ava/prefixed_state.go index 92b3491..9906381 100644 --- a/vms/components/ava/prefixed_state.go +++ b/vms/components/ava/prefixed_state.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/snow/choices" "github.com/ava-labs/gecko/utils/hashing" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) // Addressable is the interface a feature extension must provide to be able to diff --git a/vms/components/ava/prefixed_state_test.go b/vms/components/ava/prefixed_state_test.go index 06cb1df..d3019d5 100644 --- a/vms/components/ava/prefixed_state_test.go +++ b/vms/components/ava/prefixed_state_test.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/database/memdb" "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/utils/hashing" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/stretchr/testify/assert" ) diff --git a/vms/components/ava/state.go b/vms/components/ava/state.go index fc3b929..df724a4 100644 --- a/vms/components/ava/state.go +++ b/vms/components/ava/state.go @@ -11,7 +11,7 @@ import ( "github.com/ava-labs/gecko/database/prefixdb" "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/snow/choices" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) var ( diff --git a/vms/components/ava/transferables.go b/vms/components/ava/transferables.go index 4aa906d..85c2414 100644 --- a/vms/components/ava/transferables.go +++ b/vms/components/ava/transferables.go @@ -10,7 +10,7 @@ import ( "github.com/ava-labs/gecko/utils" "github.com/ava-labs/gecko/utils/crypto" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/verify" ) diff --git a/vms/components/ava/transferables_test.go b/vms/components/ava/transferables_test.go index 80205a6..08d7b69 100644 --- a/vms/components/ava/transferables_test.go +++ b/vms/components/ava/transferables_test.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/utils/formatting" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/secp256k1fx" ) diff --git a/vms/components/ava/utxo_id_test.go b/vms/components/ava/utxo_id_test.go index 7944961..d1be00f 100644 --- a/vms/components/ava/utxo_id_test.go +++ b/vms/components/ava/utxo_id_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/ava-labs/gecko/ids" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) func TestUTXOIDVerifyNil(t *testing.T) { diff --git a/vms/components/ava/utxo_test.go b/vms/components/ava/utxo_test.go index 07b067a..151e219 100644 --- a/vms/components/ava/utxo_test.go +++ b/vms/components/ava/utxo_test.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/ids" "github.com/ava-labs/gecko/utils/formatting" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/secp256k1fx" ) diff --git a/vms/nftfx/fx_test.go b/vms/nftfx/fx_test.go index d965902..0cfbd87 100644 --- a/vms/nftfx/fx_test.go +++ b/vms/nftfx/fx_test.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/utils/hashing" "github.com/ava-labs/gecko/utils/logging" "github.com/ava-labs/gecko/utils/timer" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/secp256k1fx" ) diff --git a/vms/platformvm/vm.go b/vms/platformvm/vm.go index 9f1ce53..1a945cb 100644 --- a/vms/platformvm/vm.go +++ b/vms/platformvm/vm.go @@ -27,7 +27,7 @@ import ( "github.com/ava-labs/gecko/utils/units" "github.com/ava-labs/gecko/utils/wrappers" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/core" "github.com/ava-labs/gecko/vms/secp256k1fx" ) diff --git a/vms/propertyfx/fx_test.go b/vms/propertyfx/fx_test.go index cfdf5c9..887cf73 100644 --- a/vms/propertyfx/fx_test.go +++ b/vms/propertyfx/fx_test.go @@ -9,7 +9,7 @@ import ( "github.com/ava-labs/gecko/utils/hashing" "github.com/ava-labs/gecko/utils/logging" "github.com/ava-labs/gecko/utils/timer" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/secp256k1fx" ) diff --git a/vms/secp256k1fx/credential_test.go b/vms/secp256k1fx/credential_test.go index 5157fab..e85ce1b 100644 --- a/vms/secp256k1fx/credential_test.go +++ b/vms/secp256k1fx/credential_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/ava-labs/gecko/utils/crypto" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) func TestCredentialVerify(t *testing.T) { diff --git a/vms/secp256k1fx/fx_test.go b/vms/secp256k1fx/fx_test.go index 79e6c89..566b4cb 100644 --- a/vms/secp256k1fx/fx_test.go +++ b/vms/secp256k1fx/fx_test.go @@ -12,7 +12,7 @@ import ( "github.com/ava-labs/gecko/utils/hashing" "github.com/ava-labs/gecko/utils/logging" "github.com/ava-labs/gecko/utils/timer" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) var ( diff --git a/vms/secp256k1fx/transer_input_test.go b/vms/secp256k1fx/transer_input_test.go index e954af0..00e894f 100644 --- a/vms/secp256k1fx/transer_input_test.go +++ b/vms/secp256k1fx/transer_input_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) func TestTransferInputAmount(t *testing.T) { diff --git a/vms/secp256k1fx/transfer_output_test.go b/vms/secp256k1fx/transfer_output_test.go index 7e87875..09bb0ce 100644 --- a/vms/secp256k1fx/transfer_output_test.go +++ b/vms/secp256k1fx/transfer_output_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/ava-labs/gecko/ids" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) func TestOutputAmount(t *testing.T) { diff --git a/vms/secp256k1fx/vm.go b/vms/secp256k1fx/vm.go index bb59166..37aa23b 100644 --- a/vms/secp256k1fx/vm.go +++ b/vms/secp256k1fx/vm.go @@ -6,7 +6,7 @@ package secp256k1fx import ( "github.com/ava-labs/gecko/utils/logging" "github.com/ava-labs/gecko/utils/timer" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" ) // VM that this Fx must be run by diff --git a/vms/timestampvm/vm.go b/vms/timestampvm/vm.go index c571d9a..5376e2f 100644 --- a/vms/timestampvm/vm.go +++ b/vms/timestampvm/vm.go @@ -12,7 +12,7 @@ import ( "github.com/ava-labs/gecko/snow" "github.com/ava-labs/gecko/snow/consensus/snowman" "github.com/ava-labs/gecko/snow/engine/common" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/components/core" ) diff --git a/xputtest/avmwallet/wallet.go b/xputtest/avmwallet/wallet.go index ef01eb0..c5d2cd9 100644 --- a/xputtest/avmwallet/wallet.go +++ b/xputtest/avmwallet/wallet.go @@ -19,7 +19,7 @@ import ( "github.com/ava-labs/gecko/utils/wrappers" "github.com/ava-labs/gecko/vms/avm" "github.com/ava-labs/gecko/vms/components/ava" - "github.com/ava-labs/gecko/vms/components/codec" + "github.com/ava-labs/gecko/utils/codec" "github.com/ava-labs/gecko/vms/secp256k1fx" )