diff --git a/contract/p/gnoswap/pool/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/p/gnoswap/gnsmath/_helper_test.gno similarity index 97% rename from contract/p/gnoswap/pool/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno rename to contract/p/gnoswap/gnsmath/_helper_test.gno index 335400f9e..fd43cfb30 100644 --- a/contract/p/gnoswap/pool/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno +++ b/contract/p/gnoswap/gnsmath/_helper_test.gno @@ -1,4 +1,4 @@ -package pool +package gnsmath import ( "testing" diff --git a/contract/p/gnoswap/pool/bit_math.gno b/contract/p/gnoswap/gnsmath/bit_math.gno similarity index 98% rename from contract/p/gnoswap/pool/bit_math.gno rename to contract/p/gnoswap/gnsmath/bit_math.gno index 3c3820308..b679cd03a 100644 --- a/contract/p/gnoswap/pool/bit_math.gno +++ b/contract/p/gnoswap/gnsmath/bit_math.gno @@ -1,4 +1,4 @@ -package pool +package gnsmath import ( u256 "gno.land/p/gnoswap/uint256" diff --git a/contract/p/gnoswap/pool/__TEST_bit_math_test.gnoA b/contract/p/gnoswap/gnsmath/bit_math_test.gno similarity index 99% rename from contract/p/gnoswap/pool/__TEST_bit_math_test.gnoA rename to contract/p/gnoswap/gnsmath/bit_math_test.gno index fdb86ab6e..6f1fb71dc 100644 --- a/contract/p/gnoswap/pool/__TEST_bit_math_test.gnoA +++ b/contract/p/gnoswap/gnsmath/bit_math_test.gno @@ -1,4 +1,4 @@ -package pool +package gnsmath import ( "testing" diff --git a/contract/p/gnoswap/pool/consts.gno b/contract/p/gnoswap/gnsmath/consts.gno similarity index 97% rename from contract/p/gnoswap/pool/consts.gno rename to contract/p/gnoswap/gnsmath/consts.gno index e8b0b33e1..11609bed2 100644 --- a/contract/p/gnoswap/pool/consts.gno +++ b/contract/p/gnoswap/gnsmath/consts.gno @@ -1,4 +1,4 @@ -package pool +package gnsmath const ( MAX_UINT8 string = "255" diff --git a/contract/p/gnoswap/gnsmath/gno.mod b/contract/p/gnoswap/gnsmath/gno.mod new file mode 100644 index 000000000..1949733a3 --- /dev/null +++ b/contract/p/gnoswap/gnsmath/gno.mod @@ -0,0 +1 @@ +module gno.land/p/gnoswap/gnsmath diff --git a/contract/p/gnoswap/pool/sqrt_price_math.gno b/contract/p/gnoswap/gnsmath/sqrt_price_math.gno similarity index 99% rename from contract/p/gnoswap/pool/sqrt_price_math.gno rename to contract/p/gnoswap/gnsmath/sqrt_price_math.gno index 34a37d655..5126bf611 100644 --- a/contract/p/gnoswap/pool/sqrt_price_math.gno +++ b/contract/p/gnoswap/gnsmath/sqrt_price_math.gno @@ -1,4 +1,4 @@ -package pool +package gnsmath import ( i256 "gno.land/p/gnoswap/int256" diff --git a/contract/p/gnoswap/pool/sqrt_price_math_test.gno b/contract/p/gnoswap/gnsmath/sqrt_price_math_test.gno similarity index 99% rename from contract/p/gnoswap/pool/sqrt_price_math_test.gno rename to contract/p/gnoswap/gnsmath/sqrt_price_math_test.gno index 24f450d51..a40e76f95 100644 --- a/contract/p/gnoswap/pool/sqrt_price_math_test.gno +++ b/contract/p/gnoswap/gnsmath/sqrt_price_math_test.gno @@ -1,4 +1,4 @@ -package pool +package gnsmath import ( "testing" diff --git a/contract/p/gnoswap/pool/swap_math.gno b/contract/p/gnoswap/gnsmath/swap_math.gno similarity index 99% rename from contract/p/gnoswap/pool/swap_math.gno rename to contract/p/gnoswap/gnsmath/swap_math.gno index 81b9c2d28..4334bd558 100644 --- a/contract/p/gnoswap/pool/swap_math.gno +++ b/contract/p/gnoswap/gnsmath/swap_math.gno @@ -1,4 +1,4 @@ -package pool +package gnsmath import ( i256 "gno.land/p/gnoswap/int256" diff --git a/contract/p/gnoswap/pool/swap_math_test.gno b/contract/p/gnoswap/gnsmath/swap_math_test.gno similarity index 99% rename from contract/p/gnoswap/pool/swap_math_test.gno rename to contract/p/gnoswap/gnsmath/swap_math_test.gno index 505a8e716..edcafcf43 100644 --- a/contract/p/gnoswap/pool/swap_math_test.gno +++ b/contract/p/gnoswap/gnsmath/swap_math_test.gno @@ -1,4 +1,4 @@ -package pool +package gnsmath import ( "testing" diff --git a/contract/p/gnoswap/pool/gno.mod b/contract/p/gnoswap/pool/gno.mod deleted file mode 100644 index ea092a3fa..000000000 --- a/contract/p/gnoswap/pool/gno.mod +++ /dev/null @@ -1 +0,0 @@ -module gno.land/p/gnoswap/pool diff --git a/contract/p/gnoswap/uint256/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/p/gnoswap/uint256/_helper_test.gno similarity index 100% rename from contract/p/gnoswap/uint256/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno rename to contract/p/gnoswap/uint256/_helper_test.gno diff --git a/contract/p/gnoswap/uint256/__TEST_u256_test.gno b/contract/p/gnoswap/uint256/uint256_test.gno similarity index 100% rename from contract/p/gnoswap/uint256/__TEST_u256_test.gno rename to contract/p/gnoswap/uint256/uint256_test.gno diff --git a/contract/r/gnoswap/v1/common/access.gno b/contract/r/gnoswap/common/access.gno similarity index 100% rename from contract/r/gnoswap/v1/common/access.gno rename to contract/r/gnoswap/common/access.gno diff --git a/contract/r/gnoswap/v1/common/access_test.gno b/contract/r/gnoswap/common/access_test.gno similarity index 100% rename from contract/r/gnoswap/v1/common/access_test.gno rename to contract/r/gnoswap/common/access_test.gno diff --git a/contract/r/gnoswap/v1/common/address_and_username.gno b/contract/r/gnoswap/common/address_and_username.gno similarity index 100% rename from contract/r/gnoswap/v1/common/address_and_username.gno rename to contract/r/gnoswap/common/address_and_username.gno diff --git a/contract/r/gnoswap/v1/common/address_and_username_test.gno b/contract/r/gnoswap/common/address_and_username_test.gno similarity index 100% rename from contract/r/gnoswap/v1/common/address_and_username_test.gno rename to contract/r/gnoswap/common/address_and_username_test.gno diff --git a/contract/r/gnoswap/v1/common/errors.gno b/contract/r/gnoswap/common/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/common/errors.gno rename to contract/r/gnoswap/common/errors.gno diff --git a/contract/r/gnoswap/v1/common/gno.mod b/contract/r/gnoswap/common/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/common/gno.mod rename to contract/r/gnoswap/common/gno.mod diff --git a/contract/r/gnoswap/v1/common/grc20reg_helper.gno b/contract/r/gnoswap/common/grc20reg_helper.gno similarity index 100% rename from contract/r/gnoswap/v1/common/grc20reg_helper.gno rename to contract/r/gnoswap/common/grc20reg_helper.gno diff --git a/contract/r/gnoswap/v1/common/grc20reg_helper_test.gno b/contract/r/gnoswap/common/grc20reg_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/common/grc20reg_helper_test.gno rename to contract/r/gnoswap/common/grc20reg_helper_test.gno diff --git a/contract/r/gnoswap/v1/common/grc721_token_id.gno b/contract/r/gnoswap/common/grc721_token_id.gno similarity index 100% rename from contract/r/gnoswap/v1/common/grc721_token_id.gno rename to contract/r/gnoswap/common/grc721_token_id.gno diff --git a/contract/r/gnoswap/v1/common/grc721_token_id_test.gno b/contract/r/gnoswap/common/grc721_token_id_test.gno similarity index 100% rename from contract/r/gnoswap/v1/common/grc721_token_id_test.gno rename to contract/r/gnoswap/common/grc721_token_id_test.gno diff --git a/contract/r/gnoswap/v1/common/halt.gno b/contract/r/gnoswap/common/halt.gno similarity index 100% rename from contract/r/gnoswap/v1/common/halt.gno rename to contract/r/gnoswap/common/halt.gno diff --git a/contract/r/gnoswap/v1/common/halt_test.gno b/contract/r/gnoswap/common/halt_test.gno similarity index 100% rename from contract/r/gnoswap/v1/common/halt_test.gno rename to contract/r/gnoswap/common/halt_test.gno diff --git a/contract/r/gnoswap/v1/common/limit_caller.gno b/contract/r/gnoswap/common/limit_caller.gno similarity index 100% rename from contract/r/gnoswap/v1/common/limit_caller.gno rename to contract/r/gnoswap/common/limit_caller.gno diff --git a/contract/r/gnoswap/v1/common/limit_caller_test.gno b/contract/r/gnoswap/common/limit_caller_test.gno similarity index 100% rename from contract/r/gnoswap/v1/common/limit_caller_test.gno rename to contract/r/gnoswap/common/limit_caller_test.gno diff --git a/contract/r/gnoswap/v1/common/liquidity_amounts.gno b/contract/r/gnoswap/common/liquidity_amounts.gno similarity index 100% rename from contract/r/gnoswap/v1/common/liquidity_amounts.gno rename to contract/r/gnoswap/common/liquidity_amounts.gno diff --git a/contract/r/gnoswap/v1/common/liquidity_amounts_test.gno b/contract/r/gnoswap/common/liquidity_amounts_test.gno similarity index 100% rename from contract/r/gnoswap/v1/common/liquidity_amounts_test.gno rename to contract/r/gnoswap/common/liquidity_amounts_test.gno diff --git a/contract/r/gnoswap/v1/common/math.gno b/contract/r/gnoswap/common/math.gno similarity index 100% rename from contract/r/gnoswap/v1/common/math.gno rename to contract/r/gnoswap/common/math.gno diff --git a/contract/r/gnoswap/v1/common/math_test.gno b/contract/r/gnoswap/common/math_test.gno similarity index 100% rename from contract/r/gnoswap/v1/common/math_test.gno rename to contract/r/gnoswap/common/math_test.gno diff --git a/contract/r/gnoswap/v1/common/strings.gno b/contract/r/gnoswap/common/strings.gno similarity index 100% rename from contract/r/gnoswap/v1/common/strings.gno rename to contract/r/gnoswap/common/strings.gno diff --git a/contract/r/gnoswap/v1/common/tick_math.gno b/contract/r/gnoswap/common/tick_math.gno similarity index 100% rename from contract/r/gnoswap/v1/common/tick_math.gno rename to contract/r/gnoswap/common/tick_math.gno diff --git a/contract/r/gnoswap/v1/common/tick_math_test.gno b/contract/r/gnoswap/common/tick_math_test.gno similarity index 100% rename from contract/r/gnoswap/v1/common/tick_math_test.gno rename to contract/r/gnoswap/common/tick_math_test.gno diff --git a/contract/r/gnoswap/v1/common/util.gno b/contract/r/gnoswap/common/util.gno similarity index 100% rename from contract/r/gnoswap/v1/common/util.gno rename to contract/r/gnoswap/common/util.gno diff --git a/contract/r/gnoswap/v1/community_pool/community_pool.gno b/contract/r/gnoswap/community_pool/community_pool.gno similarity index 100% rename from contract/r/gnoswap/v1/community_pool/community_pool.gno rename to contract/r/gnoswap/community_pool/community_pool.gno diff --git a/contract/r/gnoswap/v1/community_pool/community_pool_test.gno b/contract/r/gnoswap/community_pool/community_pool_test.gno similarity index 100% rename from contract/r/gnoswap/v1/community_pool/community_pool_test.gno rename to contract/r/gnoswap/community_pool/community_pool_test.gno diff --git a/contract/r/gnoswap/v1/community_pool/errors.gno b/contract/r/gnoswap/community_pool/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/community_pool/errors.gno rename to contract/r/gnoswap/community_pool/errors.gno diff --git a/contract/r/gnoswap/v1/community_pool/gno.mod b/contract/r/gnoswap/community_pool/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/community_pool/gno.mod rename to contract/r/gnoswap/community_pool/gno.mod diff --git a/contract/r/gnoswap/v1/community_pool/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno b/contract/r/gnoswap/community_pool/tests/init_token_register_test.gno similarity index 100% rename from contract/r/gnoswap/v1/community_pool/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno rename to contract/r/gnoswap/community_pool/tests/init_token_register_test.gno diff --git a/contract/r/gnoswap/v1/community_pool/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/r/gnoswap/community_pool/tests/init_variable_and_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/community_pool/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno rename to contract/r/gnoswap/community_pool/tests/init_variable_and_helper_test.gno diff --git a/contract/r/gnoswap/v1/consts/consts.gno b/contract/r/gnoswap/consts/consts.gno similarity index 100% rename from contract/r/gnoswap/v1/consts/consts.gno rename to contract/r/gnoswap/consts/consts.gno diff --git a/contract/r/gnoswap/v1/consts/gno.mod b/contract/r/gnoswap/consts/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/consts/gno.mod rename to contract/r/gnoswap/consts/gno.mod diff --git a/contract/r/gnoswap/v1/emission/_test_helper.gno b/contract/r/gnoswap/emission/_test_helper.gno similarity index 100% rename from contract/r/gnoswap/v1/emission/_test_helper.gno rename to contract/r/gnoswap/emission/_test_helper.gno diff --git a/contract/r/gnoswap/v1/emission/callback.gno b/contract/r/gnoswap/emission/callback.gno similarity index 100% rename from contract/r/gnoswap/v1/emission/callback.gno rename to contract/r/gnoswap/emission/callback.gno diff --git a/contract/r/gnoswap/v1/emission/distribution.gno b/contract/r/gnoswap/emission/distribution.gno similarity index 100% rename from contract/r/gnoswap/v1/emission/distribution.gno rename to contract/r/gnoswap/emission/distribution.gno diff --git a/contract/r/gnoswap/v1/emission/distribution_test.gno b/contract/r/gnoswap/emission/distribution_test.gno similarity index 100% rename from contract/r/gnoswap/v1/emission/distribution_test.gno rename to contract/r/gnoswap/emission/distribution_test.gno diff --git a/contract/r/gnoswap/v1/emission/emission.gno b/contract/r/gnoswap/emission/emission.gno similarity index 100% rename from contract/r/gnoswap/v1/emission/emission.gno rename to contract/r/gnoswap/emission/emission.gno diff --git a/contract/r/gnoswap/v1/emission/emission_test.gno b/contract/r/gnoswap/emission/emission_test.gno similarity index 100% rename from contract/r/gnoswap/v1/emission/emission_test.gno rename to contract/r/gnoswap/emission/emission_test.gno diff --git a/contract/r/gnoswap/v1/emission/errors.gno b/contract/r/gnoswap/emission/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/emission/errors.gno rename to contract/r/gnoswap/emission/errors.gno diff --git a/contract/r/gnoswap/v1/emission/gno.mod b/contract/r/gnoswap/emission/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/emission/gno.mod rename to contract/r/gnoswap/emission/gno.mod diff --git a/contract/r/gnoswap/v1/emission/utils.gno b/contract/r/gnoswap/emission/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/emission/utils.gno rename to contract/r/gnoswap/emission/utils.gno diff --git a/contract/r/gnoswap/v1/gnft/errors.gno b/contract/r/gnoswap/gnft/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/gnft/errors.gno rename to contract/r/gnoswap/gnft/errors.gno diff --git a/contract/r/gnoswap/v1/gnft/gnft.gno b/contract/r/gnoswap/gnft/gnft.gno similarity index 100% rename from contract/r/gnoswap/v1/gnft/gnft.gno rename to contract/r/gnoswap/gnft/gnft.gno diff --git a/contract/r/gnoswap/v1/gnft/gnft_test.gno b/contract/r/gnoswap/gnft/gnft_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gnft/gnft_test.gno rename to contract/r/gnoswap/gnft/gnft_test.gno diff --git a/contract/r/gnoswap/v1/gnft/gno.mod b/contract/r/gnoswap/gnft/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/gnft/gno.mod rename to contract/r/gnoswap/gnft/gno.mod diff --git a/contract/r/gnoswap/v1/gnft/svg_generator.gno b/contract/r/gnoswap/gnft/svg_generator.gno similarity index 100% rename from contract/r/gnoswap/v1/gnft/svg_generator.gno rename to contract/r/gnoswap/gnft/svg_generator.gno diff --git a/contract/r/gnoswap/v1/gnft/svg_generator_test.gno b/contract/r/gnoswap/gnft/svg_generator_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gnft/svg_generator_test.gno rename to contract/r/gnoswap/gnft/svg_generator_test.gno diff --git a/contract/r/gnoswap/v1/gnft/utils.gno b/contract/r/gnoswap/gnft/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/gnft/utils.gno rename to contract/r/gnoswap/gnft/utils.gno diff --git a/contract/r/gnoswap/v1/gns/_helper_test.gno b/contract/r/gnoswap/gns/_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/_helper_test.gno rename to contract/r/gnoswap/gns/_helper_test.gno diff --git a/contract/r/gnoswap/v1/gns/errors.gno b/contract/r/gnoswap/gns/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/errors.gno rename to contract/r/gnoswap/gns/errors.gno diff --git a/contract/r/gnoswap/v1/gns/gno.mod b/contract/r/gnoswap/gns/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/gns/gno.mod rename to contract/r/gnoswap/gns/gno.mod diff --git a/contract/r/gnoswap/v1/gns/gns.gno b/contract/r/gnoswap/gns/gns.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/gns.gno rename to contract/r/gnoswap/gns/gns.gno diff --git a/contract/r/gnoswap/v1/gns/gns_test.gno b/contract/r/gnoswap/gns/gns_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/gns_test.gno rename to contract/r/gnoswap/gns/gns_test.gno diff --git a/contract/r/gnoswap/v1/gns/halving.gno b/contract/r/gnoswap/gns/halving.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/halving.gno rename to contract/r/gnoswap/gns/halving.gno diff --git a/contract/r/gnoswap/v1/gns/halving_test.gno b/contract/r/gnoswap/gns/halving_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/halving_test.gno rename to contract/r/gnoswap/gns/halving_test.gno diff --git a/contract/r/gnoswap/v1/gns/tests/gns_calculate_and_mint_test.gnoA b/contract/r/gnoswap/gns/tests/gns_calculate_and_mint_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gns/tests/gns_calculate_and_mint_test.gnoA rename to contract/r/gnoswap/gns/tests/gns_calculate_and_mint_test.gnoA diff --git a/contract/r/gnoswap/v1/gns/tests/minted_and_left_emission_amount_test.gnoA b/contract/r/gnoswap/gns/tests/minted_and_left_emission_amount_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gns/tests/minted_and_left_emission_amount_test.gnoA rename to contract/r/gnoswap/gns/tests/minted_and_left_emission_amount_test.gnoA diff --git a/contract/r/gnoswap/v1/gns/tests/z1_filetest.gno b/contract/r/gnoswap/gns/tests/z1_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/tests/z1_filetest.gno rename to contract/r/gnoswap/gns/tests/z1_filetest.gno diff --git a/contract/r/gnoswap/v1/gns/tests/z2_filetest.gno b/contract/r/gnoswap/gns/tests/z2_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/tests/z2_filetest.gno rename to contract/r/gnoswap/gns/tests/z2_filetest.gno diff --git a/contract/r/gnoswap/v1/gns/tests/z3_filetest.gno b/contract/r/gnoswap/gns/tests/z3_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/tests/z3_filetest.gno rename to contract/r/gnoswap/gns/tests/z3_filetest.gno diff --git a/contract/r/gnoswap/v1/gns/tests/z4_filetest.gno b/contract/r/gnoswap/gns/tests/z4_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/tests/z4_filetest.gno rename to contract/r/gnoswap/gns/tests/z4_filetest.gno diff --git a/contract/r/gnoswap/v1/gns/utils.gno b/contract/r/gnoswap/gns/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/gns/utils.gno rename to contract/r/gnoswap/gns/utils.gno diff --git a/contract/r/gnoswap/v1/gov/doc.gno b/contract/r/gnoswap/gov/doc.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/doc.gno rename to contract/r/gnoswap/gov/doc.gno diff --git a/contract/r/gnoswap/v1/gov/governance/api.gno b/contract/r/gnoswap/gov/governance/api.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/api.gno rename to contract/r/gnoswap/gov/governance/api.gno diff --git a/contract/r/gnoswap/v1/gov/governance/api_test.gno b/contract/r/gnoswap/gov/governance/api_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/api_test.gno rename to contract/r/gnoswap/gov/governance/api_test.gno diff --git a/contract/r/gnoswap/v1/gov/governance/config.gno b/contract/r/gnoswap/gov/governance/config.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/config.gno rename to contract/r/gnoswap/gov/governance/config.gno diff --git a/contract/r/gnoswap/v1/gov/governance/config_test.gno b/contract/r/gnoswap/gov/governance/config_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/config_test.gno rename to contract/r/gnoswap/gov/governance/config_test.gno diff --git a/contract/r/gnoswap/v1/gov/governance/errors.gno b/contract/r/gnoswap/gov/governance/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/errors.gno rename to contract/r/gnoswap/gov/governance/errors.gno diff --git a/contract/r/gnoswap/v1/gov/governance/execute.gno b/contract/r/gnoswap/gov/governance/execute.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/execute.gno rename to contract/r/gnoswap/gov/governance/execute.gno diff --git a/contract/r/gnoswap/v1/gov/governance/execute_test.gno b/contract/r/gnoswap/gov/governance/execute_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/execute_test.gno rename to contract/r/gnoswap/gov/governance/execute_test.gno diff --git a/contract/r/gnoswap/v1/gov/governance/fn_registry.gno b/contract/r/gnoswap/gov/governance/fn_registry.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/fn_registry.gno rename to contract/r/gnoswap/gov/governance/fn_registry.gno diff --git a/contract/r/gnoswap/v1/gov/governance/fn_registry_test.gno b/contract/r/gnoswap/gov/governance/fn_registry_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/fn_registry_test.gno rename to contract/r/gnoswap/gov/governance/fn_registry_test.gno diff --git a/contract/r/gnoswap/v1/gov/governance/getter_proposal.gno b/contract/r/gnoswap/gov/governance/getter_proposal.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/getter_proposal.gno rename to contract/r/gnoswap/gov/governance/getter_proposal.gno diff --git a/contract/r/gnoswap/v1/gov/governance/getter_vote.gno b/contract/r/gnoswap/gov/governance/getter_vote.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/getter_vote.gno rename to contract/r/gnoswap/gov/governance/getter_vote.gno diff --git a/contract/r/gnoswap/v1/gov/governance/gno.mod b/contract/r/gnoswap/gov/governance/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/gno.mod rename to contract/r/gnoswap/gov/governance/gno.mod diff --git a/contract/r/gnoswap/v1/gov/governance/proposal.gno b/contract/r/gnoswap/gov/governance/proposal.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/proposal.gno rename to contract/r/gnoswap/gov/governance/proposal.gno diff --git a/contract/r/gnoswap/v1/gov/governance/proposal_test.gno b/contract/r/gnoswap/gov/governance/proposal_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/proposal_test.gno rename to contract/r/gnoswap/gov/governance/proposal_test.gno diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno b/contract/r/gnoswap/gov/governance/tests/_0_init_token_register_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno rename to contract/r/gnoswap/gov/governance/tests/_0_init_token_register_test.gno diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/r/gnoswap/gov/governance/tests/_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno rename to contract/r/gnoswap/gov/governance/tests/_helper_test.gno diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_MULTI_execute_test.gnoA b/contract/r/gnoswap/gov/governance/tests/governance_proposal_MULTI_execute_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_MULTI_execute_test.gnoA rename to contract/r/gnoswap/gov/governance/tests/governance_proposal_MULTI_execute_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_community_pool_spend_test.gnoA b/contract/r/gnoswap/gov/governance/tests/governance_proposal_community_pool_spend_test.gnoA similarity index 99% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_community_pool_spend_test.gnoA rename to contract/r/gnoswap/gov/governance/tests/governance_proposal_community_pool_spend_test.gnoA index 49de42d1b..ef2a38bf6 100644 --- a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_community_pool_spend_test.gnoA +++ b/contract/r/gnoswap/gov/governance/tests/governance_proposal_community_pool_spend_test.gnoA @@ -1,11 +1,10 @@ package governance import ( - "strconv" "std" + "strconv" "testing" - "gno.land/p/demo/avl" "gno.land/p/demo/testutils" "gno.land/p/demo/uassert" diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_execute_test.gnoA b/contract/r/gnoswap/gov/governance/tests/governance_proposal_execute_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_execute_test.gnoA rename to contract/r/gnoswap/gov/governance/tests/governance_proposal_execute_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_status_update_test.gnoA b/contract/r/gnoswap/gov/governance/tests/governance_proposal_status_update_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_status_update_test.gnoA rename to contract/r/gnoswap/gov/governance/tests/governance_proposal_status_update_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_text_test.gnoA b/contract/r/gnoswap/gov/governance/tests/governance_proposal_text_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_text_test.gnoA rename to contract/r/gnoswap/gov/governance/tests/governance_proposal_text_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_test.gnoA b/contract/r/gnoswap/gov/governance/tests/governance_vote_gov_delegated_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_test.gnoA rename to contract/r/gnoswap/gov/governance/tests/governance_vote_gov_delegated_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_after_propose_before_vote_test.gnoA b/contract/r/gnoswap/gov/governance/tests/governance_vote_gov_delegated_undelegated_after_propose_before_vote_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_after_propose_before_vote_test.gnoA rename to contract/r/gnoswap/gov/governance/tests/governance_vote_gov_delegated_undelegated_after_propose_before_vote_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_before_propose_test.gnoA b/contract/r/gnoswap/gov/governance/tests/governance_vote_gov_delegated_undelegated_before_propose_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_before_propose_test.gnoA rename to contract/r/gnoswap/gov/governance/tests/governance_vote_gov_delegated_undelegated_before_propose_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_with_launchpad_xgns_test.gnoA b/contract/r/gnoswap/gov/governance/tests/governance_vote_with_launchpad_xgns_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_with_launchpad_xgns_test.gnoA rename to contract/r/gnoswap/gov/governance/tests/governance_vote_with_launchpad_xgns_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/governance/type.gno b/contract/r/gnoswap/gov/governance/type.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/type.gno rename to contract/r/gnoswap/gov/governance/type.gno diff --git a/contract/r/gnoswap/v1/gov/governance/utils.gno b/contract/r/gnoswap/gov/governance/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/utils.gno rename to contract/r/gnoswap/gov/governance/utils.gno diff --git a/contract/r/gnoswap/v1/gov/governance/vote.gno b/contract/r/gnoswap/gov/governance/vote.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/vote.gno rename to contract/r/gnoswap/gov/governance/vote.gno diff --git a/contract/r/gnoswap/v1/gov/governance/vote_test.gno b/contract/r/gnoswap/gov/governance/vote_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/governance/vote_test.gno rename to contract/r/gnoswap/gov/governance/vote_test.gno diff --git a/contract/r/gnoswap/v1/gov/staker/api_delegation.gno b/contract/r/gnoswap/gov/staker/api_delegation.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/api_delegation.gno rename to contract/r/gnoswap/gov/staker/api_delegation.gno diff --git a/contract/r/gnoswap/v1/gov/staker/api_history.gno b/contract/r/gnoswap/gov/staker/api_history.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/api_history.gno rename to contract/r/gnoswap/gov/staker/api_history.gno diff --git a/contract/r/gnoswap/v1/gov/staker/api_staker.gno b/contract/r/gnoswap/gov/staker/api_staker.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/api_staker.gno rename to contract/r/gnoswap/gov/staker/api_staker.gno diff --git a/contract/r/gnoswap/v1/gov/staker/api_staker_test.gno b/contract/r/gnoswap/gov/staker/api_staker_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/api_staker_test.gno rename to contract/r/gnoswap/gov/staker/api_staker_test.gno diff --git a/contract/r/gnoswap/v1/gov/staker/clean_delegation_stat_history.gno b/contract/r/gnoswap/gov/staker/clean_delegation_stat_history.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/clean_delegation_stat_history.gno rename to contract/r/gnoswap/gov/staker/clean_delegation_stat_history.gno diff --git a/contract/r/gnoswap/v1/gov/staker/clean_delegation_stat_history_test.gno b/contract/r/gnoswap/gov/staker/clean_delegation_stat_history_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/clean_delegation_stat_history_test.gno rename to contract/r/gnoswap/gov/staker/clean_delegation_stat_history_test.gno diff --git a/contract/r/gnoswap/v1/gov/staker/delegate_undelegate.gno b/contract/r/gnoswap/gov/staker/delegate_undelegate.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/delegate_undelegate.gno rename to contract/r/gnoswap/gov/staker/delegate_undelegate.gno diff --git a/contract/r/gnoswap/v1/gov/staker/delegate_undelegate_test.gno b/contract/r/gnoswap/gov/staker/delegate_undelegate_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/delegate_undelegate_test.gno rename to contract/r/gnoswap/gov/staker/delegate_undelegate_test.gno diff --git a/contract/r/gnoswap/v1/gov/staker/errors.gno b/contract/r/gnoswap/gov/staker/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/errors.gno rename to contract/r/gnoswap/gov/staker/errors.gno diff --git a/contract/r/gnoswap/v1/gov/staker/gno.mod b/contract/r/gnoswap/gov/staker/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/gno.mod rename to contract/r/gnoswap/gov/staker/gno.mod diff --git a/contract/r/gnoswap/v1/gov/staker/history.gno b/contract/r/gnoswap/gov/staker/history.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/history.gno rename to contract/r/gnoswap/gov/staker/history.gno diff --git a/contract/r/gnoswap/v1/gov/staker/history_test.gno b/contract/r/gnoswap/gov/staker/history_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/history_test.gno rename to contract/r/gnoswap/gov/staker/history_test.gno diff --git a/contract/r/gnoswap/v1/gov/staker/reward_calculation.gno b/contract/r/gnoswap/gov/staker/reward_calculation.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/reward_calculation.gno rename to contract/r/gnoswap/gov/staker/reward_calculation.gno diff --git a/contract/r/gnoswap/v1/gov/staker/reward_calculation_test.gno b/contract/r/gnoswap/gov/staker/reward_calculation_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/reward_calculation_test.gno rename to contract/r/gnoswap/gov/staker/reward_calculation_test.gno diff --git a/contract/r/gnoswap/v1/gov/staker/staker.gno b/contract/r/gnoswap/gov/staker/staker.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/staker.gno rename to contract/r/gnoswap/gov/staker/staker.gno diff --git a/contract/r/gnoswap/v1/gov/staker/staker_test.gno b/contract/r/gnoswap/gov/staker/staker_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/staker_test.gno rename to contract/r/gnoswap/gov/staker/staker_test.gno diff --git a/contract/r/gnoswap/v1/gov/staker/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA b/contract/r/gnoswap/gov/staker/tests/_0_init_token_register_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA rename to contract/r/gnoswap/gov/staker/tests/_0_init_token_register_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/staker/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gnoA b/contract/r/gnoswap/gov/staker/tests/_helper_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gnoA rename to contract/r/gnoswap/gov/staker/tests/_helper_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/staker/tests/__TEST_api_test.gnoA b/contract/r/gnoswap/gov/staker/tests/api_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/tests/__TEST_api_test.gnoA rename to contract/r/gnoswap/gov/staker/tests/api_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/staker/tests/clean_delegation_stat_history_test.gnoA b/contract/r/gnoswap/gov/staker/tests/clean_delegation_stat_history_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/tests/clean_delegation_stat_history_test.gnoA rename to contract/r/gnoswap/gov/staker/tests/clean_delegation_stat_history_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/staker/tests/__TEST_emission_gns_mint_test.gnoA b/contract/r/gnoswap/gov/staker/tests/emission_gns_mint_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/tests/__TEST_emission_gns_mint_test.gnoA rename to contract/r/gnoswap/gov/staker/tests/emission_gns_mint_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_emission_test.gnoA b/contract/r/gnoswap/gov/staker/tests/governance_reward_emission_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_emission_test.gnoA rename to contract/r/gnoswap/gov/staker/tests/governance_reward_emission_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_protocol_fee_test.gnoA b/contract/r/gnoswap/gov/staker/tests/governance_reward_protocol_fee_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_protocol_fee_test.gnoA rename to contract/r/gnoswap/gov/staker/tests/governance_reward_protocol_fee_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_protocol_fee_with_launchpad_test.gnoA b/contract/r/gnoswap/gov/staker/tests/governance_reward_protocol_fee_with_launchpad_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_protocol_fee_with_launchpad_test.gnoA rename to contract/r/gnoswap/gov/staker/tests/governance_reward_protocol_fee_with_launchpad_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/staker/tests/history_test.gnoA b/contract/r/gnoswap/gov/staker/tests/history_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/tests/history_test.gnoA rename to contract/r/gnoswap/gov/staker/tests/history_test.gnoA diff --git a/contract/r/gnoswap/v1/gov/staker/util.gno b/contract/r/gnoswap/gov/staker/util.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/util.gno rename to contract/r/gnoswap/gov/staker/util.gno diff --git a/contract/r/gnoswap/v1/gov/staker/util_test.gno b/contract/r/gnoswap/gov/staker/util_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/staker/util_test.gno rename to contract/r/gnoswap/gov/staker/util_test.gno diff --git a/contract/r/gnoswap/v1/gov/xgns/errors.gno b/contract/r/gnoswap/gov/xgns/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/xgns/errors.gno rename to contract/r/gnoswap/gov/xgns/errors.gno diff --git a/contract/r/gnoswap/v1/gov/xgns/gno.mod b/contract/r/gnoswap/gov/xgns/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/gov/xgns/gno.mod rename to contract/r/gnoswap/gov/xgns/gno.mod diff --git a/contract/r/gnoswap/v1/gov/xgns/xgns.gno b/contract/r/gnoswap/gov/xgns/xgns.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/xgns/xgns.gno rename to contract/r/gnoswap/gov/xgns/xgns.gno diff --git a/contract/r/gnoswap/v1/gov/xgns/xgns_test.gno b/contract/r/gnoswap/gov/xgns/xgns_test.gno similarity index 100% rename from contract/r/gnoswap/v1/gov/xgns/xgns_test.gno rename to contract/r/gnoswap/gov/xgns/xgns_test.gno diff --git a/contract/r/gnoswap/v1/launchpad/_helper_test.gno b/contract/r/gnoswap/launchpad/_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/_helper_test.gno rename to contract/r/gnoswap/launchpad/_helper_test.gno diff --git a/contract/r/gnoswap/v1/launchpad/api_deposit.gno b/contract/r/gnoswap/launchpad/api_deposit.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/api_deposit.gno rename to contract/r/gnoswap/launchpad/api_deposit.gno diff --git a/contract/r/gnoswap/v1/launchpad/api_project.gno b/contract/r/gnoswap/launchpad/api_project.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/api_project.gno rename to contract/r/gnoswap/launchpad/api_project.gno diff --git a/contract/r/gnoswap/v1/launchpad/api_reward.gno b/contract/r/gnoswap/launchpad/api_reward.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/api_reward.gno rename to contract/r/gnoswap/launchpad/api_reward.gno diff --git a/contract/r/gnoswap/v1/launchpad/consts.gno b/contract/r/gnoswap/launchpad/consts.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/consts.gno rename to contract/r/gnoswap/launchpad/consts.gno diff --git a/contract/r/gnoswap/v1/launchpad/deposit.gno b/contract/r/gnoswap/launchpad/deposit.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/deposit.gno rename to contract/r/gnoswap/launchpad/deposit.gno diff --git a/contract/r/gnoswap/v1/launchpad/deposit_test.gno b/contract/r/gnoswap/launchpad/deposit_test.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/deposit_test.gno rename to contract/r/gnoswap/launchpad/deposit_test.gno diff --git a/contract/r/gnoswap/v1/launchpad/doc.gno b/contract/r/gnoswap/launchpad/doc.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/doc.gno rename to contract/r/gnoswap/launchpad/doc.gno diff --git a/contract/r/gnoswap/v1/launchpad/errors.gno b/contract/r/gnoswap/launchpad/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/errors.gno rename to contract/r/gnoswap/launchpad/errors.gno diff --git a/contract/r/gnoswap/v1/launchpad/gno.mod b/contract/r/gnoswap/launchpad/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/launchpad/gno.mod rename to contract/r/gnoswap/launchpad/gno.mod diff --git a/contract/r/gnoswap/v1/launchpad/json_builder.gno b/contract/r/gnoswap/launchpad/json_builder.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/json_builder.gno rename to contract/r/gnoswap/launchpad/json_builder.gno diff --git a/contract/r/gnoswap/v1/launchpad/json_builder_test.gno b/contract/r/gnoswap/launchpad/json_builder_test.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/json_builder_test.gno rename to contract/r/gnoswap/launchpad/json_builder_test.gno diff --git a/contract/r/gnoswap/v1/launchpad/launchpad.gno b/contract/r/gnoswap/launchpad/launchpad.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/launchpad.gno rename to contract/r/gnoswap/launchpad/launchpad.gno diff --git a/contract/r/gnoswap/v1/launchpad/launchpad_test.gno b/contract/r/gnoswap/launchpad/launchpad_test.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/launchpad_test.gno rename to contract/r/gnoswap/launchpad/launchpad_test.gno diff --git a/contract/r/gnoswap/v1/launchpad/reward.gno b/contract/r/gnoswap/launchpad/reward.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/reward.gno rename to contract/r/gnoswap/launchpad/reward.gno diff --git a/contract/r/gnoswap/v1/launchpad/reward_calculation.gno b/contract/r/gnoswap/launchpad/reward_calculation.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/reward_calculation.gno rename to contract/r/gnoswap/launchpad/reward_calculation.gno diff --git a/contract/r/gnoswap/v1/launchpad/reward_calculation_test.gno b/contract/r/gnoswap/launchpad/reward_calculation_test.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/reward_calculation_test.gno rename to contract/r/gnoswap/launchpad/reward_calculation_test.gno diff --git a/contract/r/gnoswap/v1/launchpad/reward_test.gno b/contract/r/gnoswap/launchpad/reward_test.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/reward_test.gno rename to contract/r/gnoswap/launchpad/reward_test.gno diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno b/contract/r/gnoswap/launchpad/tests/_0_init_token_register_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno rename to contract/r/gnoswap/launchpad/tests/_0_init_token_register_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/r/gnoswap/launchpad/tests/_helper_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno rename to contract/r/gnoswap/launchpad/tests/_helper_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_create_project_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_create_project_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_create_project_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_create_project_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_deposit_project_single_recipient_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_deposit_project_single_recipient_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_deposit_project_single_recipient_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_deposit_project_single_recipient_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_deposit_project_two_recipient_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_deposit_project_two_recipient_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_deposit_project_two_recipient_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_deposit_project_two_recipient_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_refund_ended_proejct_no_deposit_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_refund_ended_proejct_no_deposit_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_refund_ended_proejct_no_deposit_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_refund_ended_proejct_no_deposit_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_refund_ended_proejct_with_tier30_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_refund_ended_proejct_with_tier30_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_refund_ended_proejct_with_tier30_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_refund_ended_proejct_with_tier30_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_01_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_reward_and_gov_reward_01_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_01_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_reward_and_gov_reward_01_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_02_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_reward_and_gov_reward_02_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_02_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_reward_and_gov_reward_02_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_03_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_reward_and_gov_reward_03_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_03_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_reward_and_gov_reward_03_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_tier180_single_deposit_reward_by_proejct_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_tier180_single_deposit_reward_by_proejct_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_tier_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_tier180_single_deposit_reward_by_proejct_tier_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_tier_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_tier180_single_deposit_reward_by_proejct_tier_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_01_deposit_collect_gns_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_tier30_single_deposit_01_deposit_collect_gns_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_01_deposit_collect_gns_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_tier30_single_deposit_01_deposit_collect_gns_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_02_deposit_reward_by_proejct_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_tier30_single_deposit_02_deposit_reward_by_proejct_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_02_deposit_reward_by_proejct_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_tier30_single_deposit_02_deposit_reward_by_proejct_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_03_deposit_reward_by_deposit_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_tier30_single_deposit_03_deposit_reward_by_deposit_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_03_deposit_reward_by_deposit_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_tier30_single_deposit_03_deposit_reward_by_deposit_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_04_deposit_reward_by_deposit_endheight_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_tier30_single_deposit_04_deposit_reward_by_deposit_endheight_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_04_deposit_reward_by_deposit_endheight_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_tier30_single_deposit_04_deposit_reward_by_deposit_endheight_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_two_deposit_reward_by_project_test.gno b/contract/r/gnoswap/launchpad/tests/launchpad_tier30_two_deposit_reward_by_project_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_two_deposit_reward_by_project_test.gno rename to contract/r/gnoswap/launchpad/tests/launchpad_tier30_two_deposit_reward_by_project_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier90_single_deposit_reward_by_proejct_tier_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_tier90_single_deposit_reward_by_proejct_tier_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier90_single_deposit_reward_by_proejct_tier_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_tier90_single_deposit_reward_by_proejct_tier_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier_all_single_deposit_reward_by_proejct_tier_test.gnoA b/contract/r/gnoswap/launchpad/tests/launchpad_tier_all_single_deposit_reward_by_proejct_tier_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier_all_single_deposit_reward_by_proejct_tier_test.gnoA rename to contract/r/gnoswap/launchpad/tests/launchpad_tier_all_single_deposit_reward_by_proejct_tier_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/tests/__TEST_RPC_api_test.gnoA b/contract/r/gnoswap/launchpad/tests/rpc_api_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/launchpad/tests/__TEST_RPC_api_test.gnoA rename to contract/r/gnoswap/launchpad/tests/rpc_api_test.gnoA diff --git a/contract/r/gnoswap/v1/launchpad/type.gno b/contract/r/gnoswap/launchpad/type.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/type.gno rename to contract/r/gnoswap/launchpad/type.gno diff --git a/contract/r/gnoswap/v1/launchpad/util.gno b/contract/r/gnoswap/launchpad/util.gno similarity index 100% rename from contract/r/gnoswap/v1/launchpad/util.gno rename to contract/r/gnoswap/launchpad/util.gno diff --git a/contract/r/gnoswap/v1/pool/_helper_test.gno b/contract/r/gnoswap/pool/_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/_helper_test.gno rename to contract/r/gnoswap/pool/_helper_test.gno diff --git a/contract/r/gnoswap/v1/pool/api.gno b/contract/r/gnoswap/pool/api.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/api.gno rename to contract/r/gnoswap/pool/api.gno diff --git a/contract/r/gnoswap/v1/pool/api_test.gno b/contract/r/gnoswap/pool/api_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/api_test.gno rename to contract/r/gnoswap/pool/api_test.gno diff --git a/contract/r/gnoswap/v1/pool/doc.gno b/contract/r/gnoswap/pool/doc.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/doc.gno rename to contract/r/gnoswap/pool/doc.gno diff --git a/contract/r/gnoswap/v1/pool/errors.gno b/contract/r/gnoswap/pool/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/errors.gno rename to contract/r/gnoswap/pool/errors.gno diff --git a/contract/r/gnoswap/v1/pool/getter.gno b/contract/r/gnoswap/pool/getter.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/getter.gno rename to contract/r/gnoswap/pool/getter.gno diff --git a/contract/r/gnoswap/v1/pool/getter_test.gno b/contract/r/gnoswap/pool/getter_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/getter_test.gno rename to contract/r/gnoswap/pool/getter_test.gno diff --git a/contract/r/gnoswap/v1/pool/gno.mod b/contract/r/gnoswap/pool/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/pool/gno.mod rename to contract/r/gnoswap/pool/gno.mod diff --git a/contract/r/gnoswap/v1/pool/liquidity_math.gno b/contract/r/gnoswap/pool/liquidity_math.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/liquidity_math.gno rename to contract/r/gnoswap/pool/liquidity_math.gno diff --git a/contract/r/gnoswap/v1/pool/liquidity_math_test.gno b/contract/r/gnoswap/pool/liquidity_math_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/liquidity_math_test.gno rename to contract/r/gnoswap/pool/liquidity_math_test.gno diff --git a/contract/r/gnoswap/v1/pool/pool.gno b/contract/r/gnoswap/pool/pool.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/pool.gno rename to contract/r/gnoswap/pool/pool.gno diff --git a/contract/r/gnoswap/v1/pool/pool_manager.gno b/contract/r/gnoswap/pool/pool_manager.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/pool_manager.gno rename to contract/r/gnoswap/pool/pool_manager.gno diff --git a/contract/r/gnoswap/v1/pool/pool_manager_test.gno b/contract/r/gnoswap/pool/pool_manager_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/pool_manager_test.gno rename to contract/r/gnoswap/pool/pool_manager_test.gno diff --git a/contract/r/gnoswap/v1/pool/pool_test.gno b/contract/r/gnoswap/pool/pool_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/pool_test.gno rename to contract/r/gnoswap/pool/pool_test.gno diff --git a/contract/r/gnoswap/v1/pool/pool_transfer.gno b/contract/r/gnoswap/pool/pool_transfer.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/pool_transfer.gno rename to contract/r/gnoswap/pool/pool_transfer.gno diff --git a/contract/r/gnoswap/v1/pool/pool_transfer_test.gno b/contract/r/gnoswap/pool/pool_transfer_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/pool_transfer_test.gno rename to contract/r/gnoswap/pool/pool_transfer_test.gno diff --git a/contract/r/gnoswap/v1/pool/position.gno b/contract/r/gnoswap/pool/position.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/position.gno rename to contract/r/gnoswap/pool/position.gno diff --git a/contract/r/gnoswap/v1/pool/position_modify.gno b/contract/r/gnoswap/pool/position_modify.gno similarity index 99% rename from contract/r/gnoswap/v1/pool/position_modify.gno rename to contract/r/gnoswap/pool/position_modify.gno index fe3bf876f..464c29233 100644 --- a/contract/r/gnoswap/v1/pool/position_modify.gno +++ b/contract/r/gnoswap/pool/position_modify.gno @@ -2,8 +2,8 @@ package pool import ( "gno.land/p/demo/ufmt" + plp "gno.land/p/gnoswap/gnsmath" i256 "gno.land/p/gnoswap/int256" - plp "gno.land/p/gnoswap/pool" u256 "gno.land/p/gnoswap/uint256" "gno.land/r/gnoswap/v1/common" "gno.land/r/gnoswap/v1/consts" diff --git a/contract/r/gnoswap/v1/pool/position_modify_test.gno b/contract/r/gnoswap/pool/position_modify_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/position_modify_test.gno rename to contract/r/gnoswap/pool/position_modify_test.gno diff --git a/contract/r/gnoswap/v1/pool/position_test.gno b/contract/r/gnoswap/pool/position_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/position_test.gno rename to contract/r/gnoswap/pool/position_test.gno diff --git a/contract/r/gnoswap/v1/pool/position_update.gno b/contract/r/gnoswap/pool/position_update.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/position_update.gno rename to contract/r/gnoswap/pool/position_update.gno diff --git a/contract/r/gnoswap/v1/pool/position_update_test.gno b/contract/r/gnoswap/pool/position_update_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/position_update_test.gno rename to contract/r/gnoswap/pool/position_update_test.gno diff --git a/contract/r/gnoswap/v1/pool/protocol_fee_pool_creation.gno b/contract/r/gnoswap/pool/protocol_fee_pool_creation.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/protocol_fee_pool_creation.gno rename to contract/r/gnoswap/pool/protocol_fee_pool_creation.gno diff --git a/contract/r/gnoswap/v1/pool/protocol_fee_pool_creation_test.gno b/contract/r/gnoswap/pool/protocol_fee_pool_creation_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/protocol_fee_pool_creation_test.gno rename to contract/r/gnoswap/pool/protocol_fee_pool_creation_test.gno diff --git a/contract/r/gnoswap/v1/pool/protocol_fee_withdrawal.gno b/contract/r/gnoswap/pool/protocol_fee_withdrawal.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/protocol_fee_withdrawal.gno rename to contract/r/gnoswap/pool/protocol_fee_withdrawal.gno diff --git a/contract/r/gnoswap/v1/pool/protocol_fee_withdrawal_test.gno b/contract/r/gnoswap/pool/protocol_fee_withdrawal_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/protocol_fee_withdrawal_test.gno rename to contract/r/gnoswap/pool/protocol_fee_withdrawal_test.gno diff --git a/contract/r/gnoswap/v1/pool/swap.gno b/contract/r/gnoswap/pool/swap.gno similarity index 99% rename from contract/r/gnoswap/v1/pool/swap.gno rename to contract/r/gnoswap/pool/swap.gno index 123c021b6..83dfcf947 100644 --- a/contract/r/gnoswap/v1/pool/swap.gno +++ b/contract/r/gnoswap/pool/swap.gno @@ -7,8 +7,8 @@ import ( "gno.land/r/gnoswap/v1/common" "gno.land/r/gnoswap/v1/consts" + plp "gno.land/p/gnoswap/gnsmath" i256 "gno.land/p/gnoswap/int256" - plp "gno.land/p/gnoswap/pool" // pool package u256 "gno.land/p/gnoswap/uint256" ) diff --git a/contract/r/gnoswap/v1/pool/swap_test.gno b/contract/r/gnoswap/pool/swap_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/swap_test.gno rename to contract/r/gnoswap/pool/swap_test.gno diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_burn_test.gnoA b/contract/r/gnoswap/pool/tests/pool_burn_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_burn_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_burn_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_create_pool_test.gnoA b/contract/r/gnoswap/pool/tests/pool_create_pool_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_create_pool_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_create_pool_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_dryswap_and_swap_test.gnoA b/contract/r/gnoswap/pool/tests/pool_dryswap_and_swap_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_dryswap_and_swap_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_dryswap_and_swap_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_fee_protocol_test.gnoA b/contract/r/gnoswap/pool/tests/pool_fee_protocol_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_fee_protocol_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_fee_protocol_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_init_test.gnoA b/contract/r/gnoswap/pool/tests/pool_init_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_init_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_init_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_limit_test.gnoA b/contract/r/gnoswap/pool/tests/pool_limit_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_limit_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_limit_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_limit_with_protocol_fee_test.gnoA b/contract/r/gnoswap/pool/tests/pool_limit_with_protocol_fee_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_limit_with_protocol_fee_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_limit_with_protocol_fee_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_mint_test.gnoA b/contract/r/gnoswap/pool/tests/pool_mint_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_mint_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_mint_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_multi_token_test.gnoA b/contract/r/gnoswap/pool/tests/pool_multi_token_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_multi_token_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_multi_token_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_native_swap_test.gnoA b/contract/r/gnoswap/pool/tests/pool_native_swap_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_native_swap_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_native_swap_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_single_lp_test.gnoA b/contract/r/gnoswap/pool/tests/pool_single_lp_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_single_lp_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_single_lp_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#1_test.gnoA b/contract/r/gnoswap/pool/tests/pool_spec_#1_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#1_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_spec_#1_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#2_test.gnoA b/contract/r/gnoswap/pool/tests/pool_spec_#2_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#2_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_spec_#2_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#3_test.gnoA b/contract/r/gnoswap/pool/tests/pool_spec_#3_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#3_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_spec_#3_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#4_test.gnoA b/contract/r/gnoswap/pool/tests/pool_spec_#4_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#4_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_spec_#4_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#5_test.gnoA b/contract/r/gnoswap/pool/tests/pool_spec_#5_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#5_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_spec_#5_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#6_test.gnoA b/contract/r/gnoswap/pool/tests/pool_spec_#6_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#6_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_spec_#6_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_test.gnoA b/contract/r/gnoswap/pool/tests/pool_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_tick_test.gnoA b/contract/r/gnoswap/pool/tests/pool_tick_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_tick_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_tick_test.gnoA diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_tick_transaction_test.gnoA b/contract/r/gnoswap/pool/tests/pool_tick_transaction_test.gnoA similarity index 98% rename from contract/r/gnoswap/v1/pool/tests/__TEST_pool_tick_transaction_test.gnoA rename to contract/r/gnoswap/pool/tests/pool_tick_transaction_test.gnoA index cddde99de..1f54bbac1 100644 --- a/contract/r/gnoswap/v1/pool/tests/__TEST_pool_tick_transaction_test.gnoA +++ b/contract/r/gnoswap/pool/tests/pool_tick_transaction_test.gnoA @@ -8,7 +8,7 @@ import ( i256 "gno.land/p/gnoswap/int256" u256 "gno.land/p/gnoswap/uint256" - plp "gno.land/p/gnoswap/pool" + plp "gno.land/p/gnoswap/gnsmath" "gno.land/r/gnoswap/v1/common" "gno.land/r/gnoswap/v1/consts" diff --git a/contract/r/gnoswap/v1/pool/tests/__TEST_tick_bitmap_test.gnoA b/contract/r/gnoswap/pool/tests/tick_bitmap_test.gnoA similarity index 99% rename from contract/r/gnoswap/v1/pool/tests/__TEST_tick_bitmap_test.gnoA rename to contract/r/gnoswap/pool/tests/tick_bitmap_test.gnoA index 6957516e7..3e2d8fb14 100644 --- a/contract/r/gnoswap/v1/pool/tests/__TEST_tick_bitmap_test.gnoA +++ b/contract/r/gnoswap/pool/tests/tick_bitmap_test.gnoA @@ -8,7 +8,7 @@ import ( u256 "gno.land/p/gnoswap/uint256" - plp "gno.land/p/gnoswap/pool" + plp "gno.land/p/gnoswap/gnsmath" "gno.land/r/gnoswap/v1/consts" ) diff --git a/contract/r/gnoswap/v1/pool/tick.gno b/contract/r/gnoswap/pool/tick.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/tick.gno rename to contract/r/gnoswap/pool/tick.gno diff --git a/contract/r/gnoswap/v1/pool/tick_bitmap.gno b/contract/r/gnoswap/pool/tick_bitmap.gno similarity index 99% rename from contract/r/gnoswap/v1/pool/tick_bitmap.gno rename to contract/r/gnoswap/pool/tick_bitmap.gno index dc7369b7f..46d4c1ec6 100644 --- a/contract/r/gnoswap/v1/pool/tick_bitmap.gno +++ b/contract/r/gnoswap/pool/tick_bitmap.gno @@ -4,7 +4,7 @@ import ( "strconv" "gno.land/p/demo/ufmt" - plp "gno.land/p/gnoswap/pool" + plp "gno.land/p/gnoswap/gnsmath" u256 "gno.land/p/gnoswap/uint256" ) diff --git a/contract/r/gnoswap/v1/pool/tick_bitmap_test.gno b/contract/r/gnoswap/pool/tick_bitmap_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/tick_bitmap_test.gno rename to contract/r/gnoswap/pool/tick_bitmap_test.gno diff --git a/contract/r/gnoswap/v1/pool/tick_test.gno b/contract/r/gnoswap/pool/tick_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/tick_test.gno rename to contract/r/gnoswap/pool/tick_test.gno diff --git a/contract/r/gnoswap/v1/pool/type.gno b/contract/r/gnoswap/pool/type.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/type.gno rename to contract/r/gnoswap/pool/type.gno diff --git a/contract/r/gnoswap/v1/pool/utils.gno b/contract/r/gnoswap/pool/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/utils.gno rename to contract/r/gnoswap/pool/utils.gno diff --git a/contract/r/gnoswap/v1/pool/utils_test.gno b/contract/r/gnoswap/pool/utils_test.gno similarity index 100% rename from contract/r/gnoswap/v1/pool/utils_test.gno rename to contract/r/gnoswap/pool/utils_test.gno diff --git a/contract/r/gnoswap/v1/position/_helper_test.gno b/contract/r/gnoswap/position/_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/position/_helper_test.gno rename to contract/r/gnoswap/position/_helper_test.gno diff --git a/contract/r/gnoswap/v1/position/api.gno b/contract/r/gnoswap/position/api.gno similarity index 100% rename from contract/r/gnoswap/v1/position/api.gno rename to contract/r/gnoswap/position/api.gno diff --git a/contract/r/gnoswap/v1/position/api_test.gno b/contract/r/gnoswap/position/api_test.gno similarity index 100% rename from contract/r/gnoswap/v1/position/api_test.gno rename to contract/r/gnoswap/position/api_test.gno diff --git a/contract/r/gnoswap/v1/position/doc.gno b/contract/r/gnoswap/position/doc.gno similarity index 100% rename from contract/r/gnoswap/v1/position/doc.gno rename to contract/r/gnoswap/position/doc.gno diff --git a/contract/r/gnoswap/v1/position/errors.gno b/contract/r/gnoswap/position/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/position/errors.gno rename to contract/r/gnoswap/position/errors.gno diff --git a/contract/r/gnoswap/v1/position/getter.gno b/contract/r/gnoswap/position/getter.gno similarity index 100% rename from contract/r/gnoswap/v1/position/getter.gno rename to contract/r/gnoswap/position/getter.gno diff --git a/contract/r/gnoswap/v1/position/getter_test.gno b/contract/r/gnoswap/position/getter_test.gno similarity index 100% rename from contract/r/gnoswap/v1/position/getter_test.gno rename to contract/r/gnoswap/position/getter_test.gno diff --git a/contract/r/gnoswap/v1/position/gno.mod b/contract/r/gnoswap/position/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/position/gno.mod rename to contract/r/gnoswap/position/gno.mod diff --git a/contract/r/gnoswap/v1/position/liquidity_management.gno b/contract/r/gnoswap/position/liquidity_management.gno similarity index 100% rename from contract/r/gnoswap/v1/position/liquidity_management.gno rename to contract/r/gnoswap/position/liquidity_management.gno diff --git a/contract/r/gnoswap/v1/position/liquidity_management_test.gno b/contract/r/gnoswap/position/liquidity_management_test.gno similarity index 100% rename from contract/r/gnoswap/v1/position/liquidity_management_test.gno rename to contract/r/gnoswap/position/liquidity_management_test.gno diff --git a/contract/r/gnoswap/v1/position/native_token.gno b/contract/r/gnoswap/position/native_token.gno similarity index 100% rename from contract/r/gnoswap/v1/position/native_token.gno rename to contract/r/gnoswap/position/native_token.gno diff --git a/contract/r/gnoswap/v1/position/native_token_test.gno b/contract/r/gnoswap/position/native_token_test.gno similarity index 100% rename from contract/r/gnoswap/v1/position/native_token_test.gno rename to contract/r/gnoswap/position/native_token_test.gno diff --git a/contract/r/gnoswap/v1/position/position.gno b/contract/r/gnoswap/position/position.gno similarity index 100% rename from contract/r/gnoswap/v1/position/position.gno rename to contract/r/gnoswap/position/position.gno diff --git a/contract/r/gnoswap/v1/position/position_test.gno b/contract/r/gnoswap/position/position_test.gno similarity index 100% rename from contract/r/gnoswap/v1/position/position_test.gno rename to contract/r/gnoswap/position/position_test.gno diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_fee_collect_with_two_user_test.gnoA b/contract/r/gnoswap/position/tests/fee_collect_with_two_user_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_fee_collect_with_two_user_test.gnoA rename to contract/r/gnoswap/position/tests/fee_collect_with_two_user_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_api_test.gnoA b/contract/r/gnoswap/position/tests/position_api_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_api_test.gnoA rename to contract/r/gnoswap/position/tests/position_api_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_full_test.gnoA b/contract/r/gnoswap/position/tests/position_full_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_full_test.gnoA rename to contract/r/gnoswap/position/tests/position_full_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_full_with_emission_test.gnoA b/contract/r/gnoswap/position/tests/position_full_with_emission_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_full_with_emission_test.gnoA rename to contract/r/gnoswap/position/tests/position_full_with_emission_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_increase_burned_position_test.gnoA b/contract/r/gnoswap/position/tests/position_increase_burned_position_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_increase_burned_position_test.gnoA rename to contract/r/gnoswap/position/tests/position_increase_burned_position_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_increase_decrease_test.gnoA b/contract/r/gnoswap/position/tests/position_increase_decrease_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_increase_decrease_test.gnoA rename to contract/r/gnoswap/position/tests/position_increase_decrease_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_mint_gnot_grc20_in-range_out-range_test.gnoA b/contract/r/gnoswap/position/tests/position_mint_gnot_grc20_in-range_out-range_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_mint_gnot_grc20_in-range_out-range_test.gnoA rename to contract/r/gnoswap/position/tests/position_mint_gnot_grc20_in-range_out-range_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_mint_swap_burn_left_test.gnoA b/contract/r/gnoswap/position/tests/position_mint_swap_burn_left_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_mint_swap_burn_left_test.gnoA rename to contract/r/gnoswap/position/tests/position_mint_swap_burn_left_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_native_increase_decrease_test.gnoA b/contract/r/gnoswap/position/tests/position_native_increase_decrease_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_native_increase_decrease_test.gnoA rename to contract/r/gnoswap/position/tests/position_native_increase_decrease_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_native_mint_swap_burn_test.gnoA b/contract/r/gnoswap/position/tests/position_native_mint_swap_burn_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_native_mint_swap_burn_test.gnoA rename to contract/r/gnoswap/position/tests/position_native_mint_swap_burn_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_gnot_pair_test.gnoA b/contract/r/gnoswap/position/tests/position_reposition_gnot_pair_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_gnot_pair_test.gnoA rename to contract/r/gnoswap/position/tests/position_reposition_gnot_pair_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_grc20_pair_test.gnoA b/contract/r/gnoswap/position/tests/position_reposition_grc20_pair_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_grc20_pair_test.gnoA rename to contract/r/gnoswap/position/tests/position_reposition_grc20_pair_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_grc20_pair_with_swap_test.gnoA b/contract/r/gnoswap/position/tests/position_reposition_grc20_pair_with_swap_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_grc20_pair_with_swap_test.gnoA rename to contract/r/gnoswap/position/tests/position_reposition_grc20_pair_with_swap_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_same_user_same_pool_diff_range_diff_position_swap_fee_test.gnoA b/contract/r/gnoswap/position/tests/position_same_user_same_pool_diff_range_diff_position_swap_fee_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_same_user_same_pool_diff_range_diff_position_swap_fee_test.gnoA rename to contract/r/gnoswap/position/tests/position_same_user_same_pool_diff_range_diff_position_swap_fee_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_same_user_same_pool_same_range_diff_position_swap_fee_test.gnoA b/contract/r/gnoswap/position/tests/position_same_user_same_pool_same_range_diff_position_swap_fee_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_same_user_same_pool_same_range_diff_position_swap_fee_test.gnoA rename to contract/r/gnoswap/position/tests/position_same_user_same_pool_same_range_diff_position_swap_fee_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_test_two_position_used_single_swap_test.gnoA b/contract/r/gnoswap/position/tests/position_test_two_position_used_single_swap_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_test_two_position_used_single_swap_test.gnoA rename to contract/r/gnoswap/position/tests/position_test_two_position_used_single_swap_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_tokens_owed_left_grc20_pair_more_action_test.gnoA b/contract/r/gnoswap/position/tests/position_tokens_owed_left_grc20_pair_more_action_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_tokens_owed_left_grc20_pair_more_action_test.gnoA rename to contract/r/gnoswap/position/tests/position_tokens_owed_left_grc20_pair_more_action_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_tokens_owed_left_pair_more_action_exact_test.gnoA b/contract/r/gnoswap/position/tests/position_tokens_owed_left_pair_more_action_exact_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_tokens_owed_left_pair_more_action_exact_test.gnoA rename to contract/r/gnoswap/position/tests/position_tokens_owed_left_pair_more_action_exact_test.gnoA diff --git a/contract/r/gnoswap/v1/position/tests/__TEST_position_unclaimed_fee_test.gnoA b/contract/r/gnoswap/position/tests/position_unclaimed_fee_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/position/tests/__TEST_position_unclaimed_fee_test.gnoA rename to contract/r/gnoswap/position/tests/position_unclaimed_fee_test.gnoA diff --git a/contract/r/gnoswap/v1/position/type.gno b/contract/r/gnoswap/position/type.gno similarity index 100% rename from contract/r/gnoswap/v1/position/type.gno rename to contract/r/gnoswap/position/type.gno diff --git a/contract/r/gnoswap/v1/position/utils.gno b/contract/r/gnoswap/position/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/position/utils.gno rename to contract/r/gnoswap/position/utils.gno diff --git a/contract/r/gnoswap/v1/position/utils_test.gno b/contract/r/gnoswap/position/utils_test.gno similarity index 100% rename from contract/r/gnoswap/v1/position/utils_test.gno rename to contract/r/gnoswap/position/utils_test.gno diff --git a/contract/r/gnoswap/v1/protocol_fee/errors.gno b/contract/r/gnoswap/protocol_fee/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/protocol_fee/errors.gno rename to contract/r/gnoswap/protocol_fee/errors.gno diff --git a/contract/r/gnoswap/v1/protocol_fee/gno.mod b/contract/r/gnoswap/protocol_fee/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/protocol_fee/gno.mod rename to contract/r/gnoswap/protocol_fee/gno.mod diff --git a/contract/r/gnoswap/v1/protocol_fee/protocol_fee.gno b/contract/r/gnoswap/protocol_fee/protocol_fee.gno similarity index 100% rename from contract/r/gnoswap/v1/protocol_fee/protocol_fee.gno rename to contract/r/gnoswap/protocol_fee/protocol_fee.gno diff --git a/contract/r/gnoswap/v1/protocol_fee/protocol_fee_test.gno b/contract/r/gnoswap/protocol_fee/protocol_fee_test.gno similarity index 100% rename from contract/r/gnoswap/v1/protocol_fee/protocol_fee_test.gno rename to contract/r/gnoswap/protocol_fee/protocol_fee_test.gno diff --git a/contract/r/gnoswap/v1/protocol_fee/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno b/contract/r/gnoswap/protocol_fee/tests/0_init_token_register_test.gno similarity index 100% rename from contract/r/gnoswap/v1/protocol_fee/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno rename to contract/r/gnoswap/protocol_fee/tests/0_init_token_register_test.gno diff --git a/contract/r/gnoswap/v1/protocol_fee/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/r/gnoswap/protocol_fee/tests/_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/protocol_fee/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno rename to contract/r/gnoswap/protocol_fee/tests/_helper_test.gno diff --git a/contract/r/gnoswap/v1/protocol_fee/token_list_with_amount.gno b/contract/r/gnoswap/protocol_fee/token_list_with_amount.gno similarity index 100% rename from contract/r/gnoswap/v1/protocol_fee/token_list_with_amount.gno rename to contract/r/gnoswap/protocol_fee/token_list_with_amount.gno diff --git a/contract/r/gnoswap/v1/protocol_fee/token_list_with_amount_test.gno b/contract/r/gnoswap/protocol_fee/token_list_with_amount_test.gno similarity index 100% rename from contract/r/gnoswap/v1/protocol_fee/token_list_with_amount_test.gno rename to contract/r/gnoswap/protocol_fee/token_list_with_amount_test.gno diff --git a/contract/r/gnoswap/v1/protocol_fee/utils.gno b/contract/r/gnoswap/protocol_fee/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/protocol_fee/utils.gno rename to contract/r/gnoswap/protocol_fee/utils.gno diff --git a/contract/r/gnoswap/v1/referral/doc.gno b/contract/r/gnoswap/referral/doc.gno similarity index 100% rename from contract/r/gnoswap/v1/referral/doc.gno rename to contract/r/gnoswap/referral/doc.gno diff --git a/contract/r/gnoswap/v1/referral/errors.gno b/contract/r/gnoswap/referral/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/referral/errors.gno rename to contract/r/gnoswap/referral/errors.gno diff --git a/contract/r/gnoswap/v1/referral/global_keeper.gno b/contract/r/gnoswap/referral/global_keeper.gno similarity index 100% rename from contract/r/gnoswap/v1/referral/global_keeper.gno rename to contract/r/gnoswap/referral/global_keeper.gno diff --git a/contract/r/gnoswap/v1/referral/gno.mod b/contract/r/gnoswap/referral/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/referral/gno.mod rename to contract/r/gnoswap/referral/gno.mod diff --git a/contract/r/gnoswap/v1/referral/keeper.gno b/contract/r/gnoswap/referral/keeper.gno similarity index 100% rename from contract/r/gnoswap/v1/referral/keeper.gno rename to contract/r/gnoswap/referral/keeper.gno diff --git a/contract/r/gnoswap/v1/referral/keeper_test.gno b/contract/r/gnoswap/referral/keeper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/referral/keeper_test.gno rename to contract/r/gnoswap/referral/keeper_test.gno diff --git a/contract/r/gnoswap/v1/referral/referral.gno b/contract/r/gnoswap/referral/referral.gno similarity index 100% rename from contract/r/gnoswap/v1/referral/referral.gno rename to contract/r/gnoswap/referral/referral.gno diff --git a/contract/r/gnoswap/v1/referral/type.gno b/contract/r/gnoswap/referral/type.gno similarity index 100% rename from contract/r/gnoswap/v1/referral/type.gno rename to contract/r/gnoswap/referral/type.gno diff --git a/contract/r/gnoswap/v1/referral/utils.gno b/contract/r/gnoswap/referral/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/referral/utils.gno rename to contract/r/gnoswap/referral/utils.gno diff --git a/contract/r/gnoswap/v1/router/_helper_test.gno b/contract/r/gnoswap/router/_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/_helper_test.gno rename to contract/r/gnoswap/router/_helper_test.gno diff --git a/contract/r/gnoswap/v1/router/base.gno b/contract/r/gnoswap/router/base.gno similarity index 100% rename from contract/r/gnoswap/v1/router/base.gno rename to contract/r/gnoswap/router/base.gno diff --git a/contract/r/gnoswap/v1/router/base_test.gno b/contract/r/gnoswap/router/base_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/base_test.gno rename to contract/r/gnoswap/router/base_test.gno diff --git a/contract/r/gnoswap/v1/router/doc.gno b/contract/r/gnoswap/router/doc.gno similarity index 100% rename from contract/r/gnoswap/v1/router/doc.gno rename to contract/r/gnoswap/router/doc.gno diff --git a/contract/r/gnoswap/v1/router/errors.gno b/contract/r/gnoswap/router/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/router/errors.gno rename to contract/r/gnoswap/router/errors.gno diff --git a/contract/r/gnoswap/v1/router/exact_in.gno b/contract/r/gnoswap/router/exact_in.gno similarity index 100% rename from contract/r/gnoswap/v1/router/exact_in.gno rename to contract/r/gnoswap/router/exact_in.gno diff --git a/contract/r/gnoswap/v1/router/exact_in_test.gno b/contract/r/gnoswap/router/exact_in_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/exact_in_test.gno rename to contract/r/gnoswap/router/exact_in_test.gno diff --git a/contract/r/gnoswap/v1/router/exact_out.gno b/contract/r/gnoswap/router/exact_out.gno similarity index 100% rename from contract/r/gnoswap/v1/router/exact_out.gno rename to contract/r/gnoswap/router/exact_out.gno diff --git a/contract/r/gnoswap/v1/router/gno.mod b/contract/r/gnoswap/router/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/router/gno.mod rename to contract/r/gnoswap/router/gno.mod diff --git a/contract/r/gnoswap/v1/router/protocol_fee_swap.gno b/contract/r/gnoswap/router/protocol_fee_swap.gno similarity index 100% rename from contract/r/gnoswap/v1/router/protocol_fee_swap.gno rename to contract/r/gnoswap/router/protocol_fee_swap.gno diff --git a/contract/r/gnoswap/v1/router/protocol_fee_swap_test.gno b/contract/r/gnoswap/router/protocol_fee_swap_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/protocol_fee_swap_test.gno rename to contract/r/gnoswap/router/protocol_fee_swap_test.gno diff --git a/contract/r/gnoswap/v1/router/router.gno b/contract/r/gnoswap/router/router.gno similarity index 100% rename from contract/r/gnoswap/v1/router/router.gno rename to contract/r/gnoswap/router/router.gno diff --git a/contract/r/gnoswap/v1/router/router_dry.gno b/contract/r/gnoswap/router/router_dry.gno similarity index 100% rename from contract/r/gnoswap/v1/router/router_dry.gno rename to contract/r/gnoswap/router/router_dry.gno diff --git a/contract/r/gnoswap/v1/router/router_dry_test.gno b/contract/r/gnoswap/router/router_dry_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/router_dry_test.gno rename to contract/r/gnoswap/router/router_dry_test.gno diff --git a/contract/r/gnoswap/v1/router/router_test.gno b/contract/r/gnoswap/router/router_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/router_test.gno rename to contract/r/gnoswap/router/router_test.gno diff --git a/contract/r/gnoswap/v1/router/swap_inner.gno b/contract/r/gnoswap/router/swap_inner.gno similarity index 100% rename from contract/r/gnoswap/v1/router/swap_inner.gno rename to contract/r/gnoswap/router/swap_inner.gno diff --git a/contract/r/gnoswap/v1/router/swap_inner_test.gno b/contract/r/gnoswap/router/swap_inner_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/swap_inner_test.gno rename to contract/r/gnoswap/router/swap_inner_test.gno diff --git a/contract/r/gnoswap/v1/router/swap_multi.gno b/contract/r/gnoswap/router/swap_multi.gno similarity index 100% rename from contract/r/gnoswap/v1/router/swap_multi.gno rename to contract/r/gnoswap/router/swap_multi.gno diff --git a/contract/r/gnoswap/v1/router/swap_multi_test.gno b/contract/r/gnoswap/router/swap_multi_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/swap_multi_test.gno rename to contract/r/gnoswap/router/swap_multi_test.gno diff --git a/contract/r/gnoswap/v1/router/swap_single.gno b/contract/r/gnoswap/router/swap_single.gno similarity index 100% rename from contract/r/gnoswap/v1/router/swap_single.gno rename to contract/r/gnoswap/router/swap_single.gno diff --git a/contract/r/gnoswap/v1/router/swap_single_test.gno b/contract/r/gnoswap/router/swap_single_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/swap_single_test.gno rename to contract/r/gnoswap/router/swap_single_test.gno diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA b/contract/r/gnoswap/router/tests/_0_init_token_register_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA rename to contract/r/gnoswap/router/tests/_0_init_token_register_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_0_INIT_VARS_HELPERS_test.gnoA b/contract/r/gnoswap/router/tests/_helper_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_0_INIT_VARS_HELPERS_test.gnoA rename to contract/r/gnoswap/router/tests/_helper_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_all_2_route_2_hop_test.gnoA b/contract/r/gnoswap/router/tests/router_all_2_route_2_hop_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_all_2_route_2_hop_test.gnoA rename to contract/r/gnoswap/router/tests/router_all_2_route_2_hop_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_all_2_route_2_hop_with_emission_test.gnoA b/contract/r/gnoswap/router/tests/router_all_2_route_2_hop_with_emission_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_all_2_route_2_hop_with_emission_test.gnoA rename to contract/r/gnoswap/router/tests/router_all_2_route_2_hop_with_emission_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_native_swap_amount_check_test.gnoA b/contract/r/gnoswap/router/tests/router_native_swap_amount_check_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_native_swap_amount_check_test.gnoA rename to contract/r/gnoswap/router/tests/router_native_swap_amount_check_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#1_ExactIn_test.gnoA b/contract/r/gnoswap/router/tests/router_spec_#1_ExactIn_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#1_ExactIn_test.gnoA rename to contract/r/gnoswap/router/tests/router_spec_#1_ExactIn_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#2_ExactIn_test.gnoA b/contract/r/gnoswap/router/tests/router_spec_#2_ExactIn_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#2_ExactIn_test.gnoA rename to contract/r/gnoswap/router/tests/router_spec_#2_ExactIn_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#3_ExactIn_test.gnoA b/contract/r/gnoswap/router/tests/router_spec_#3_ExactIn_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#3_ExactIn_test.gnoA rename to contract/r/gnoswap/router/tests/router_spec_#3_ExactIn_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#4_ExactIn_test.gnoA b/contract/r/gnoswap/router/tests/router_spec_#4_ExactIn_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#4_ExactIn_test.gnoA rename to contract/r/gnoswap/router/tests/router_spec_#4_ExactIn_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#5_ExactOut_test.gnoA b/contract/r/gnoswap/router/tests/router_spec_#5_ExactOut_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#5_ExactOut_test.gnoA rename to contract/r/gnoswap/router/tests/router_spec_#5_ExactOut_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#6_ExactOut_test.gnoA b/contract/r/gnoswap/router/tests/router_spec_#6_ExactOut_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#6_ExactOut_test.gnoA rename to contract/r/gnoswap/router/tests/router_spec_#6_ExactOut_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#7_ExactOut_test.gnoA b/contract/r/gnoswap/router/tests/router_spec_#7_ExactOut_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#7_ExactOut_test.gnoA rename to contract/r/gnoswap/router/tests/router_spec_#7_ExactOut_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#8_ExactOut_test.gnoA b/contract/r/gnoswap/router/tests/router_spec_#8_ExactOut_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#8_ExactOut_test.gnoA rename to contract/r/gnoswap/router/tests/router_spec_#8_ExactOut_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_in_test.gnoA b/contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_all_liquidity_exact_in_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_in_test.gnoA rename to contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_all_liquidity_exact_in_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_out_test.gnoA b/contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_all_liquidity_exact_out_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_out_test.gnoA rename to contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_all_liquidity_exact_out_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_native_in_out_test_exact_in_test.gnoA b/contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_native_in_out_test_exact_in_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_native_in_out_test_exact_in_test.gnoA rename to contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_native_in_out_test_exact_in_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_out_range_test.gnoA b/contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_out_range_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_out_range_test.gnoA rename to contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_out_range_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_test.gnoA b/contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_test.gnoA rename to contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_wrapped_native_in_out_test.gnoA b/contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_wrapped_native_in_out_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_wrapped_native_in_out_test.gnoA rename to contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_wrapped_native_in_out_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_2hop_wrapped_native_in_out_test.gnoA b/contract/r/gnoswap/router/tests/router_swap_route_1route_2hop_wrapped_native_in_out_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_2hop_wrapped_native_in_out_test.gnoA rename to contract/r/gnoswap/router/tests/router_swap_route_1route_2hop_wrapped_native_in_out_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_3hop_wrapped_native_middle_test.gnoA b/contract/r/gnoswap/router/tests/router_swap_route_1route_3hop_wrapped_native_middle_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_3hop_wrapped_native_middle_test.gnoA rename to contract/r/gnoswap/router/tests/router_swap_route_1route_3hop_wrapped_native_middle_test.gnoA diff --git a/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_2route_2hop_test.gnoA b/contract/r/gnoswap/router/tests/router_swap_route_2route_2hop_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_2route_2hop_test.gnoA rename to contract/r/gnoswap/router/tests/router_swap_route_2route_2hop_test.gnoA diff --git a/contract/r/gnoswap/v1/router/type.gno b/contract/r/gnoswap/router/type.gno similarity index 100% rename from contract/r/gnoswap/v1/router/type.gno rename to contract/r/gnoswap/router/type.gno diff --git a/contract/r/gnoswap/v1/router/type_test.gno b/contract/r/gnoswap/router/type_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/type_test.gno rename to contract/r/gnoswap/router/type_test.gno diff --git a/contract/r/gnoswap/v1/router/utils.gno b/contract/r/gnoswap/router/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/router/utils.gno rename to contract/r/gnoswap/router/utils.gno diff --git a/contract/r/gnoswap/v1/router/utils_test.gno b/contract/r/gnoswap/router/utils_test.gno similarity index 100% rename from contract/r/gnoswap/v1/router/utils_test.gno rename to contract/r/gnoswap/router/utils_test.gno diff --git a/contract/r/gnoswap/v1/router/wrap_unwrap.gno b/contract/r/gnoswap/router/wrap_unwrap.gno similarity index 100% rename from contract/r/gnoswap/v1/router/wrap_unwrap.gno rename to contract/r/gnoswap/router/wrap_unwrap.gno diff --git a/contract/r/gnoswap/v1/staker/README.md b/contract/r/gnoswap/staker/README.md similarity index 100% rename from contract/r/gnoswap/v1/staker/README.md rename to contract/r/gnoswap/staker/README.md diff --git a/contract/r/gnoswap/v1/staker/_helper_test.gno b/contract/r/gnoswap/staker/_helper_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/_helper_test.gno rename to contract/r/gnoswap/staker/_helper_test.gno diff --git a/contract/r/gnoswap/v1/staker/api.gno b/contract/r/gnoswap/staker/api.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/api.gno rename to contract/r/gnoswap/staker/api.gno diff --git a/contract/r/gnoswap/v1/staker/calculate_pool_position_reward.gno b/contract/r/gnoswap/staker/calculate_pool_position_reward.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/calculate_pool_position_reward.gno rename to contract/r/gnoswap/staker/calculate_pool_position_reward.gno diff --git a/contract/r/gnoswap/v1/staker/callback.gno b/contract/r/gnoswap/staker/callback.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/callback.gno rename to contract/r/gnoswap/staker/callback.gno diff --git a/contract/r/gnoswap/v1/staker/doc.gno b/contract/r/gnoswap/staker/doc.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/doc.gno rename to contract/r/gnoswap/staker/doc.gno diff --git a/contract/r/gnoswap/v1/staker/errors.gno b/contract/r/gnoswap/staker/errors.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/errors.gno rename to contract/r/gnoswap/staker/errors.gno diff --git a/contract/r/gnoswap/v1/staker/external_deposit_fee.gno b/contract/r/gnoswap/staker/external_deposit_fee.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/external_deposit_fee.gno rename to contract/r/gnoswap/staker/external_deposit_fee.gno diff --git a/contract/r/gnoswap/v1/staker/external_deposit_fee_test.gno b/contract/r/gnoswap/staker/external_deposit_fee_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/external_deposit_fee_test.gno rename to contract/r/gnoswap/staker/external_deposit_fee_test.gno diff --git a/contract/r/gnoswap/v1/staker/external_token_list.gno b/contract/r/gnoswap/staker/external_token_list.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/external_token_list.gno rename to contract/r/gnoswap/staker/external_token_list.gno diff --git a/contract/r/gnoswap/v1/staker/external_token_list_test.gno b/contract/r/gnoswap/staker/external_token_list_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/external_token_list_test.gno rename to contract/r/gnoswap/staker/external_token_list_test.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/average_block_time_change_from_gns_filetest.gno b/contract/r/gnoswap/staker/filetests/average_block_time_change_from_gns_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/average_block_time_change_from_gns_filetest.gno rename to contract/r/gnoswap/staker/filetests/average_block_time_change_from_gns_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/no_position_to_give_reward_filetest.gno b/contract/r/gnoswap/staker/filetests/no_position_to_give_reward_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/no_position_to_give_reward_filetest.gno rename to contract/r/gnoswap/staker/filetests/no_position_to_give_reward_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/pool_add_to_tier2_and_change_to_tier3_internal_filetest.gno b/contract/r/gnoswap/staker/filetests/pool_add_to_tier2_and_change_to_tier3_internal_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/pool_add_to_tier2_and_change_to_tier3_internal_filetest.gno rename to contract/r/gnoswap/staker/filetests/pool_add_to_tier2_and_change_to_tier3_internal_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/pool_add_to_tier2_and_removed_internal_filetest.gno b/contract/r/gnoswap/staker/filetests/pool_add_to_tier2_and_removed_internal_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/pool_add_to_tier2_and_removed_internal_filetest.gno rename to contract/r/gnoswap/staker/filetests/pool_add_to_tier2_and_removed_internal_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/position_inrange_change_by_swap_external_filetest.gno b/contract/r/gnoswap/staker/filetests/position_inrange_change_by_swap_external_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/position_inrange_change_by_swap_external_filetest.gno rename to contract/r/gnoswap/staker/filetests/position_inrange_change_by_swap_external_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/position_inrange_change_by_swap_internal_filetest.gno b/contract/r/gnoswap/staker/filetests/position_inrange_change_by_swap_internal_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/position_inrange_change_by_swap_internal_filetest.gno rename to contract/r/gnoswap/staker/filetests/position_inrange_change_by_swap_internal_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/reward_for_user_collect_change_by_collecting_reward_external_filetest.gno b/contract/r/gnoswap/staker/filetests/reward_for_user_collect_change_by_collecting_reward_external_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/reward_for_user_collect_change_by_collecting_reward_external_filetest.gno rename to contract/r/gnoswap/staker/filetests/reward_for_user_collect_change_by_collecting_reward_external_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/reward_for_user_collect_change_by_collecting_reward_internal_filetest.gno b/contract/r/gnoswap/staker/filetests/reward_for_user_collect_change_by_collecting_reward_internal_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/reward_for_user_collect_change_by_collecting_reward_internal_filetest.gno rename to contract/r/gnoswap/staker/filetests/reward_for_user_collect_change_by_collecting_reward_internal_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/single_gns_external_ends_filetest.gno b/contract/r/gnoswap/staker/filetests/single_gns_external_ends_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/single_gns_external_ends_filetest.gno rename to contract/r/gnoswap/staker/filetests/single_gns_external_ends_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/single_position_stake_unstake_restake_filetest.gno b/contract/r/gnoswap/staker/filetests/single_position_stake_unstake_restake_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/single_position_stake_unstake_restake_filetest.gno rename to contract/r/gnoswap/staker/filetests/single_position_stake_unstake_restake_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/single_position_stake_unstake_same_block_filetest.gno b/contract/r/gnoswap/staker/filetests/single_position_stake_unstake_same_block_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/single_position_stake_unstake_same_block_filetest.gno rename to contract/r/gnoswap/staker/filetests/single_position_stake_unstake_same_block_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/staked_liquidity_change_by_staking_unstaking_external_filetest.gno b/contract/r/gnoswap/staker/filetests/staked_liquidity_change_by_staking_unstaking_external_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/staked_liquidity_change_by_staking_unstaking_external_filetest.gno rename to contract/r/gnoswap/staker/filetests/staked_liquidity_change_by_staking_unstaking_external_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/filetests/staked_liquidity_change_by_staking_unstaking_internal_filetest.gno b/contract/r/gnoswap/staker/filetests/staked_liquidity_change_by_staking_unstaking_internal_filetest.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/filetests/staked_liquidity_change_by_staking_unstaking_internal_filetest.gno rename to contract/r/gnoswap/staker/filetests/staked_liquidity_change_by_staking_unstaking_internal_filetest.gno diff --git a/contract/r/gnoswap/v1/staker/getter.gno b/contract/r/gnoswap/staker/getter.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/getter.gno rename to contract/r/gnoswap/staker/getter.gno diff --git a/contract/r/gnoswap/v1/staker/gno.mod b/contract/r/gnoswap/staker/gno.mod similarity index 100% rename from contract/r/gnoswap/v1/staker/gno.mod rename to contract/r/gnoswap/staker/gno.mod diff --git a/contract/r/gnoswap/v1/staker/incentive_id.gno b/contract/r/gnoswap/staker/incentive_id.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/incentive_id.gno rename to contract/r/gnoswap/staker/incentive_id.gno diff --git a/contract/r/gnoswap/v1/staker/incentive_id_test.gno b/contract/r/gnoswap/staker/incentive_id_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/incentive_id_test.gno rename to contract/r/gnoswap/staker/incentive_id_test.gno diff --git a/contract/r/gnoswap/v1/staker/manage_pool_tier_and_warmup.gno b/contract/r/gnoswap/staker/manage_pool_tier_and_warmup.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/manage_pool_tier_and_warmup.gno rename to contract/r/gnoswap/staker/manage_pool_tier_and_warmup.gno diff --git a/contract/r/gnoswap/v1/staker/mint_stake.gno b/contract/r/gnoswap/staker/mint_stake.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/mint_stake.gno rename to contract/r/gnoswap/staker/mint_stake.gno diff --git a/contract/r/gnoswap/v1/staker/protocol_fee_unstaking.gno b/contract/r/gnoswap/staker/protocol_fee_unstaking.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/protocol_fee_unstaking.gno rename to contract/r/gnoswap/staker/protocol_fee_unstaking.gno diff --git a/contract/r/gnoswap/v1/staker/protocol_fee_unstaking_test.gno b/contract/r/gnoswap/staker/protocol_fee_unstaking_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/protocol_fee_unstaking_test.gno rename to contract/r/gnoswap/staker/protocol_fee_unstaking_test.gno diff --git a/contract/r/gnoswap/v1/staker/query.gno b/contract/r/gnoswap/staker/query.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/query.gno rename to contract/r/gnoswap/staker/query.gno diff --git a/contract/r/gnoswap/v1/staker/query_test.gno b/contract/r/gnoswap/staker/query_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/query_test.gno rename to contract/r/gnoswap/staker/query_test.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation.gno b/contract/r/gnoswap/staker/reward_calculation.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation.gno rename to contract/r/gnoswap/staker/reward_calculation.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_canonical_env_test.gno b/contract/r/gnoswap/staker/reward_calculation_canonical_env_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_canonical_env_test.gno rename to contract/r/gnoswap/staker/reward_calculation_canonical_env_test.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_canonical_test.gno b/contract/r/gnoswap/staker/reward_calculation_canonical_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_canonical_test.gno rename to contract/r/gnoswap/staker/reward_calculation_canonical_test.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_incentives.gno b/contract/r/gnoswap/staker/reward_calculation_incentives.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_incentives.gno rename to contract/r/gnoswap/staker/reward_calculation_incentives.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_pool.gno b/contract/r/gnoswap/staker/reward_calculation_pool.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_pool.gno rename to contract/r/gnoswap/staker/reward_calculation_pool.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_pool_tier.gno b/contract/r/gnoswap/staker/reward_calculation_pool_tier.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_pool_tier.gno rename to contract/r/gnoswap/staker/reward_calculation_pool_tier.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_pool_tier_test.gno b/contract/r/gnoswap/staker/reward_calculation_pool_tier_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_pool_tier_test.gno rename to contract/r/gnoswap/staker/reward_calculation_pool_tier_test.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_tick.gno b/contract/r/gnoswap/staker/reward_calculation_tick.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_tick.gno rename to contract/r/gnoswap/staker/reward_calculation_tick.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_tick_test.gno b/contract/r/gnoswap/staker/reward_calculation_tick_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_tick_test.gno rename to contract/r/gnoswap/staker/reward_calculation_tick_test.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_types.gno b/contract/r/gnoswap/staker/reward_calculation_types.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_types.gno rename to contract/r/gnoswap/staker/reward_calculation_types.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_types_test.gno b/contract/r/gnoswap/staker/reward_calculation_types_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_types_test.gno rename to contract/r/gnoswap/staker/reward_calculation_types_test.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_warmup.gno b/contract/r/gnoswap/staker/reward_calculation_warmup.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_warmup.gno rename to contract/r/gnoswap/staker/reward_calculation_warmup.gno diff --git a/contract/r/gnoswap/v1/staker/reward_calculation_warmup_test.gno b/contract/r/gnoswap/staker/reward_calculation_warmup_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_calculation_warmup_test.gno rename to contract/r/gnoswap/staker/reward_calculation_warmup_test.gno diff --git a/contract/r/gnoswap/v1/staker/reward_pool_store.gno b/contract/r/gnoswap/staker/reward_pool_store.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_pool_store.gno rename to contract/r/gnoswap/staker/reward_pool_store.gno diff --git a/contract/r/gnoswap/v1/staker/reward_pool_store_test.gno b/contract/r/gnoswap/staker/reward_pool_store_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/reward_pool_store_test.gno rename to contract/r/gnoswap/staker/reward_pool_store_test.gno diff --git a/contract/r/gnoswap/v1/staker/staker.gno b/contract/r/gnoswap/staker/staker.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/staker.gno rename to contract/r/gnoswap/staker/staker.gno diff --git a/contract/r/gnoswap/v1/staker/staker_external_incentive.gno b/contract/r/gnoswap/staker/staker_external_incentive.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/staker_external_incentive.gno rename to contract/r/gnoswap/staker/staker_external_incentive.gno diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_full_internal_external_test.gnoA b/contract/r/gnoswap/staker/tests/full_internal_external_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_full_internal_external_test.gnoA rename to contract/r/gnoswap/staker/tests/full_internal_external_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA b/contract/r/gnoswap/staker/tests/more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA rename to contract/r/gnoswap/staker/tests/more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA b/contract/r/gnoswap/staker/tests/more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA rename to contract/r/gnoswap/staker/tests/more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA b/contract/r/gnoswap/staker/tests/more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA rename to contract/r/gnoswap/staker/tests/more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_short_warmup_internal_gnot_gns_3000_test.gnoA b/contract/r/gnoswap/staker/tests/short_warmup_internal_gnot_gns_3000_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_short_warmup_internal_gnot_gns_3000_test.gnoA rename to contract/r/gnoswap/staker/tests/short_warmup_internal_gnot_gns_3000_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_NFT_transfer_01_test.gnoA b/contract/r/gnoswap/staker/tests/staker_NFT_transfer_01_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_NFT_transfer_01_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_NFT_transfer_01_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_NFT_transfer_02_test.gnoA b/contract/r/gnoswap/staker/tests/staker_NFT_transfer_02_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_NFT_transfer_02_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_NFT_transfer_02_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_NFT_transfer_03_test.gnoA b/contract/r/gnoswap/staker/tests/staker_NFT_transfer_03_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_NFT_transfer_03_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_NFT_transfer_03_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_external_native_coin_test.gnoA b/contract/r/gnoswap/staker/tests/staker_external_native_coin_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_external_native_coin_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_external_native_coin_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_manage_pool_tiers_test.gnoA b/contract/r/gnoswap/staker/tests/staker_manage_pool_tiers_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_manage_pool_tiers_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_manage_pool_tiers_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_mint_and_stake_test.gnoA b/contract/r/gnoswap/staker/tests/staker_mint_and_stake_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_mint_and_stake_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_mint_and_stake_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_native_create_collect_unstake_test.gnoA b/contract/r/gnoswap/staker/tests/staker_native_create_collect_unstake_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_native_create_collect_unstake_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_native_create_collect_unstake_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_calculate_pool_position_reward_API_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_calculate_pool_position_reward_API_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_calculate_pool_position_reward_API_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_calculate_pool_position_reward_API_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_10_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_10_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_10_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_10_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_12_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_12_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_12_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_12_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_13_gns_external_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_13_gns_external_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_13_gns_external_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_13_gns_external_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_14_position_in_out_range_changed_by_swap_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_14_position_in_out_range_changed_by_swap_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_14_position_in_out_range_changed_by_swap_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_14_position_in_out_range_changed_by_swap_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_15_90d_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_15_90d_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_15_90d_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_15_90d_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_16_180d_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_16_180d_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_16_180d_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_16_180d_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_17_365d_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_17_365d_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_external_17_365d_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_17_365d_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_01_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_01_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_01_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_01_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_02_small_liq_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_02_small_liq_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_02_small_liq_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_02_small_liq_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_03_change_tier_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_03_change_tier_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_03_change_tier_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_03_change_tier_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_04_remove_tier_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_04_remove_tier_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_04_remove_tier_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_04_remove_tier_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA rename to contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/tests/__TEST_token_uri_in_same_block_test.gnoA b/contract/r/gnoswap/staker/tests/token_uri_in_same_block_test.gnoA similarity index 100% rename from contract/r/gnoswap/v1/staker/tests/__TEST_token_uri_in_same_block_test.gnoA rename to contract/r/gnoswap/staker/tests/token_uri_in_same_block_test.gnoA diff --git a/contract/r/gnoswap/v1/staker/type.gno b/contract/r/gnoswap/staker/type.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/type.gno rename to contract/r/gnoswap/staker/type.gno diff --git a/contract/r/gnoswap/v1/staker/utils.gno b/contract/r/gnoswap/staker/utils.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/utils.gno rename to contract/r/gnoswap/staker/utils.gno diff --git a/contract/r/gnoswap/v1/staker/utils_test.gno b/contract/r/gnoswap/staker/utils_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/utils_test.gno rename to contract/r/gnoswap/staker/utils_test.gno diff --git a/contract/r/gnoswap/v1/staker/warp_unwrap_test.gno b/contract/r/gnoswap/staker/warp_unwrap_test.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/warp_unwrap_test.gno rename to contract/r/gnoswap/staker/warp_unwrap_test.gno diff --git a/contract/r/gnoswap/v1/staker/wrap_unwrap.gno b/contract/r/gnoswap/staker/wrap_unwrap.gno similarity index 100% rename from contract/r/gnoswap/v1/staker/wrap_unwrap.gno rename to contract/r/gnoswap/staker/wrap_unwrap.gno diff --git a/contract/r/onbloc/bar/bar.gno b/contract/r/gnoswap/test_token/bar/bar.gno similarity index 100% rename from contract/r/onbloc/bar/bar.gno rename to contract/r/gnoswap/test_token/bar/bar.gno diff --git a/contract/r/onbloc/bar/gno.mod b/contract/r/gnoswap/test_token/bar/gno.mod similarity index 100% rename from contract/r/onbloc/bar/gno.mod rename to contract/r/gnoswap/test_token/bar/gno.mod diff --git a/contract/r/onbloc/baz/baz.gno b/contract/r/gnoswap/test_token/baz/baz.gno similarity index 100% rename from contract/r/onbloc/baz/baz.gno rename to contract/r/gnoswap/test_token/baz/baz.gno diff --git a/contract/r/onbloc/baz/gno.mod b/contract/r/gnoswap/test_token/baz/gno.mod similarity index 100% rename from contract/r/onbloc/baz/gno.mod rename to contract/r/gnoswap/test_token/baz/gno.mod diff --git a/contract/r/onbloc/foo/foo.gno b/contract/r/gnoswap/test_token/foo/foo.gno similarity index 100% rename from contract/r/onbloc/foo/foo.gno rename to contract/r/gnoswap/test_token/foo/foo.gno diff --git a/contract/r/onbloc/foo/gno.mod b/contract/r/gnoswap/test_token/foo/gno.mod similarity index 100% rename from contract/r/onbloc/foo/gno.mod rename to contract/r/gnoswap/test_token/foo/gno.mod diff --git a/contract/r/onbloc/obl/gno.mod b/contract/r/gnoswap/test_token/obl/gno.mod similarity index 100% rename from contract/r/onbloc/obl/gno.mod rename to contract/r/gnoswap/test_token/obl/gno.mod diff --git a/contract/r/onbloc/obl/obl.gno b/contract/r/gnoswap/test_token/obl/obl.gno similarity index 100% rename from contract/r/onbloc/obl/obl.gno rename to contract/r/gnoswap/test_token/obl/obl.gno diff --git a/contract/r/onbloc/qux/gno.mod b/contract/r/gnoswap/test_token/qux/gno.mod similarity index 100% rename from contract/r/onbloc/qux/gno.mod rename to contract/r/gnoswap/test_token/qux/gno.mod diff --git a/contract/r/onbloc/qux/qux.gno b/contract/r/gnoswap/test_token/qux/qux.gno similarity index 100% rename from contract/r/onbloc/qux/qux.gno rename to contract/r/gnoswap/test_token/qux/qux.gno diff --git a/contract/r/onbloc/usdc/gno.mod b/contract/r/gnoswap/test_token/usdc/gno.mod similarity index 100% rename from contract/r/onbloc/usdc/gno.mod rename to contract/r/gnoswap/test_token/usdc/gno.mod diff --git a/contract/r/onbloc/usdc/usdc.gno b/contract/r/gnoswap/test_token/usdc/usdc.gno similarity index 100% rename from contract/r/onbloc/usdc/usdc.gno rename to contract/r/gnoswap/test_token/usdc/usdc.gno diff --git a/contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/gno.mod b/contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/gno.mod deleted file mode 100644 index 62b3faf3f..000000000 --- a/contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/gno.mod +++ /dev/null @@ -1 +0,0 @@ -module gno.land/r/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/v2/register_gnodev \ No newline at end of file diff --git a/contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/register_gnodev.gno b/contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/register_gnodev.gno deleted file mode 100644 index 1746a401c..000000000 --- a/contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/register_gnodev.gno +++ /dev/null @@ -1,233 +0,0 @@ -package register_gnodev - -import ( - pusers "gno.land/p/demo/users" - - "gno.land/r/onbloc/bar" - "gno.land/r/onbloc/baz" - "gno.land/r/onbloc/foo" - - "gno.land/r/onbloc/obl" - "gno.land/r/onbloc/qux" - "gno.land/r/onbloc/usdc" - - "gno.land/r/demo/foo20" - "gno.land/r/demo/wugnot" - - "gno.land/r/gnoswap/v1/gns" - - cp "gno.land/r/gnoswap/v1/community_pool" - gs "gno.land/r/gnoswap/v1/gov/staker" - lp "gno.land/r/gnoswap/v1/launchpad" - pl "gno.land/r/gnoswap/v1/pool" - pf "gno.land/r/gnoswap/v1/protocol_fee" - rr "gno.land/r/gnoswap/v1/router" - sr "gno.land/r/gnoswap/v1/staker" -) - -type FooToken struct{} - -func (FooToken) Transfer() func(to pusers.AddressOrName, amount uint64) { - return foo.Transfer -} -func (FooToken) TransferFrom() func(from, to pusers.AddressOrName, amount uint64) { - return foo.TransferFrom -} -func (FooToken) BalanceOf() func(owner pusers.AddressOrName) uint64 { - return foo.BalanceOf -} -func (FooToken) Approve() func(spender pusers.AddressOrName, amount uint64) { - return foo.Approve -} - -type BarToken struct{} - -func (BarToken) Transfer() func(to pusers.AddressOrName, amount uint64) { - return bar.Transfer -} -func (BarToken) TransferFrom() func(from, to pusers.AddressOrName, amount uint64) { - return bar.TransferFrom -} -func (BarToken) BalanceOf() func(owner pusers.AddressOrName) uint64 { - return bar.BalanceOf -} -func (BarToken) Approve() func(spender pusers.AddressOrName, amount uint64) { - return bar.Approve -} - -type BazToken struct{} - -func (BazToken) Transfer() func(to pusers.AddressOrName, amount uint64) { - return baz.Transfer -} -func (BazToken) TransferFrom() func(from, to pusers.AddressOrName, amount uint64) { - return baz.TransferFrom -} -func (BazToken) BalanceOf() func(owner pusers.AddressOrName) uint64 { - return baz.BalanceOf -} -func (BazToken) Approve() func(spender pusers.AddressOrName, amount uint64) { - return baz.Approve -} - -type QuxToken struct{} - -func (QuxToken) Transfer() func(to pusers.AddressOrName, amount uint64) { - return qux.Transfer -} -func (QuxToken) TransferFrom() func(from, to pusers.AddressOrName, amount uint64) { - return qux.TransferFrom -} -func (QuxToken) BalanceOf() func(owner pusers.AddressOrName) uint64 { - return qux.BalanceOf -} -func (QuxToken) Approve() func(spender pusers.AddressOrName, amount uint64) { - return qux.Approve -} - -type GnsToken struct{} - -func (GnsToken) Transfer() func(to pusers.AddressOrName, amount uint64) { - return gns.Transfer -} -func (GnsToken) TransferFrom() func(from, to pusers.AddressOrName, amount uint64) { - return gns.TransferFrom -} -func (GnsToken) BalanceOf() func(owner pusers.AddressOrName) uint64 { - return gns.BalanceOf -} -func (GnsToken) Approve() func(spender pusers.AddressOrName, amount uint64) { - return gns.Approve -} - -type OblToken struct{} - -func (OblToken) Transfer() func(to pusers.AddressOrName, amount uint64) { - return obl.Transfer -} -func (OblToken) TransferFrom() func(from, to pusers.AddressOrName, amount uint64) { - return obl.TransferFrom -} -func (OblToken) BalanceOf() func(owner pusers.AddressOrName) uint64 { - return obl.BalanceOf -} -func (OblToken) Approve() func(spender pusers.AddressOrName, amount uint64) { - return obl.Approve -} - -type Foo20Token struct{} - -func (Foo20Token) Transfer() func(to pusers.AddressOrName, amount uint64) { - return foo20.Transfer -} -func (Foo20Token) TransferFrom() func(from, to pusers.AddressOrName, amount uint64) { - return foo20.TransferFrom -} -func (Foo20Token) BalanceOf() func(owner pusers.AddressOrName) uint64 { - return foo20.BalanceOf -} -func (Foo20Token) Approve() func(spender pusers.AddressOrName, amount uint64) { - return foo20.Approve -} - -type WugnotToken struct{} - -func (WugnotToken) Transfer() func(to pusers.AddressOrName, amount uint64) { - return wugnot.Transfer -} -func (WugnotToken) TransferFrom() func(from, to pusers.AddressOrName, amount uint64) { - return wugnot.TransferFrom -} -func (WugnotToken) BalanceOf() func(owner pusers.AddressOrName) uint64 { - return wugnot.BalanceOf -} -func (WugnotToken) Approve() func(spender pusers.AddressOrName, amount uint64) { - return wugnot.Approve -} - -type UsdcToken struct{} - -func (UsdcToken) Transfer() func(to pusers.AddressOrName, amount uint64) { - return usdc.Transfer -} -func (UsdcToken) TransferFrom() func(from, to pusers.AddressOrName, amount uint64) { - return usdc.TransferFrom -} -func (UsdcToken) BalanceOf() func(owner pusers.AddressOrName) uint64 { - return usdc.BalanceOf -} -func (UsdcToken) Approve() func(spender pusers.AddressOrName, amount uint64) { - return usdc.Approve -} - -func init() { - pl.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{}) - pl.RegisterGRC20Interface("gno.land/r/demo/foo20", Foo20Token{}) - pl.RegisterGRC20Interface("gno.land/r/onbloc/foo", FooToken{}) - pl.RegisterGRC20Interface("gno.land/r/onbloc/bar", BarToken{}) - pl.RegisterGRC20Interface("gno.land/r/onbloc/baz", BazToken{}) - pl.RegisterGRC20Interface("gno.land/r/onbloc/qux", QuxToken{}) - pl.RegisterGRC20Interface("gno.land/r/onbloc/obl", OblToken{}) - pl.RegisterGRC20Interface("gno.land/r/onbloc/usdc", UsdcToken{}) - pl.RegisterGRC20Interface("gno.land/r/gnoswap/v1/gns", GnsToken{}) - - sr.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{}) - sr.RegisterGRC20Interface("gno.land/r/demo/foo20", Foo20Token{}) - sr.RegisterGRC20Interface("gno.land/r/onbloc/foo", FooToken{}) - sr.RegisterGRC20Interface("gno.land/r/onbloc/bar", BarToken{}) - sr.RegisterGRC20Interface("gno.land/r/onbloc/baz", BazToken{}) - sr.RegisterGRC20Interface("gno.land/r/onbloc/qux", QuxToken{}) - sr.RegisterGRC20Interface("gno.land/r/onbloc/obl", OblToken{}) - sr.RegisterGRC20Interface("gno.land/r/onbloc/usdc", UsdcToken{}) - sr.RegisterGRC20Interface("gno.land/r/gnoswap/v1/gns", GnsToken{}) - - rr.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{}) - rr.RegisterGRC20Interface("gno.land/r/demo/foo20", Foo20Token{}) - rr.RegisterGRC20Interface("gno.land/r/onbloc/foo", FooToken{}) - rr.RegisterGRC20Interface("gno.land/r/onbloc/bar", BarToken{}) - rr.RegisterGRC20Interface("gno.land/r/onbloc/baz", BazToken{}) - rr.RegisterGRC20Interface("gno.land/r/onbloc/qux", QuxToken{}) - rr.RegisterGRC20Interface("gno.land/r/onbloc/obl", OblToken{}) - rr.RegisterGRC20Interface("gno.land/r/onbloc/usdc", UsdcToken{}) - rr.RegisterGRC20Interface("gno.land/r/gnoswap/v1/gns", GnsToken{}) - - pf.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{}) - pf.RegisterGRC20Interface("gno.land/r/demo/foo20", Foo20Token{}) - pf.RegisterGRC20Interface("gno.land/r/onbloc/foo", FooToken{}) - pf.RegisterGRC20Interface("gno.land/r/onbloc/bar", BarToken{}) - pf.RegisterGRC20Interface("gno.land/r/onbloc/baz", BazToken{}) - pf.RegisterGRC20Interface("gno.land/r/onbloc/qux", QuxToken{}) - pf.RegisterGRC20Interface("gno.land/r/onbloc/obl", OblToken{}) - pf.RegisterGRC20Interface("gno.land/r/onbloc/usdc", UsdcToken{}) - pf.RegisterGRC20Interface("gno.land/r/gnoswap/v1/gns", GnsToken{}) - - cp.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{}) - cp.RegisterGRC20Interface("gno.land/r/demo/foo20", Foo20Token{}) - cp.RegisterGRC20Interface("gno.land/r/onbloc/foo", FooToken{}) - cp.RegisterGRC20Interface("gno.land/r/onbloc/bar", BarToken{}) - cp.RegisterGRC20Interface("gno.land/r/onbloc/baz", BazToken{}) - cp.RegisterGRC20Interface("gno.land/r/onbloc/qux", QuxToken{}) - cp.RegisterGRC20Interface("gno.land/r/onbloc/obl", OblToken{}) - cp.RegisterGRC20Interface("gno.land/r/onbloc/usdc", UsdcToken{}) - cp.RegisterGRC20Interface("gno.land/r/gnoswap/v1/gns", GnsToken{}) - - gs.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{}) - gs.RegisterGRC20Interface("gno.land/r/demo/foo20", Foo20Token{}) - gs.RegisterGRC20Interface("gno.land/r/onbloc/foo", FooToken{}) - gs.RegisterGRC20Interface("gno.land/r/onbloc/bar", BarToken{}) - gs.RegisterGRC20Interface("gno.land/r/onbloc/baz", BazToken{}) - gs.RegisterGRC20Interface("gno.land/r/onbloc/qux", QuxToken{}) - gs.RegisterGRC20Interface("gno.land/r/onbloc/obl", OblToken{}) - gs.RegisterGRC20Interface("gno.land/r/onbloc/usdc", UsdcToken{}) - gs.RegisterGRC20Interface("gno.land/r/gnoswap/v1/gns", GnsToken{}) - - lp.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{}) - lp.RegisterGRC20Interface("gno.land/r/demo/foo20", Foo20Token{}) - lp.RegisterGRC20Interface("gno.land/r/onbloc/foo", FooToken{}) - lp.RegisterGRC20Interface("gno.land/r/onbloc/bar", BarToken{}) - lp.RegisterGRC20Interface("gno.land/r/onbloc/baz", BazToken{}) - lp.RegisterGRC20Interface("gno.land/r/onbloc/qux", QuxToken{}) - lp.RegisterGRC20Interface("gno.land/r/onbloc/obl", OblToken{}) - lp.RegisterGRC20Interface("gno.land/r/onbloc/usdc", UsdcToken{}) - lp.RegisterGRC20Interface("gno.land/r/gnoswap/v1/gns", GnsToken{}) -}