Change module name to addresses to avoid key prefix collision

PeggyJV · Mar 13, 2024 · 6bc712c · 6bc712c
1 parent 1814cf1
commit 6bc712c
Show file tree

Hide file tree

Showing 10 changed files with 188 additions and 189 deletions.
diff --git a/proto/addressmap/v1/addressmap.proto → proto/addresses/v1/addresses.proto b/proto/addressmap/v1/addressmap.proto → proto/addresses/v1/addresses.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
-package addressmap.v1;
+package addresses.v1;
 
-option go_package = "github.com/peggyjv/sommelier/v7/x/addressmap/types/v1";
+option go_package = "github.com/peggyjv/sommelier/v7/x/addresses/types/v1";
 
 message AddressMapping {
     string cosmos_address = 1;

diff --git a/proto/addresses/v1/genesis.proto b/proto/addresses/v1/genesis.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+package addresses.v1;
+
+option go_package = "github.com/peggyjv/sommelier/v7/x/addresses/types/v1";
+
+import "addresses/v1/addresses.proto";
+
+message GenesisState {
+    repeated AddressMapping address_mappings = 1;
+}
diff --git a/proto/addressmap/v1/query.proto → proto/addresses/v1/query.proto b/proto/addressmap/v1/query.proto → proto/addresses/v1/query.proto
@@ -1,26 +1,26 @@
 syntax = "proto3";
 
-package addressmap.v1;
+package addresses.v1;
 
-import "addressmap/v1/addressmap.proto";
+import "addresses/v1/addresses.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
 
-option go_package = "github.com/peggyjv/sommelier/v7/x/addressmap/types/v1";
+option go_package = "github.com/peggyjv/sommelier/v7/x/addresses/types/v1";
 
 service Query {
     rpc QueryAddressMappings(QueryAddressMappingsRequest) returns (QueryAddressMappingsResponse) {
-        option (google.api.http).get = "/sommelier/addressmap/v1/address_mappings";
+        option (google.api.http).get = "/sommelier/addresses/v1/address_mappings";
     }
 
     rpc QueryAddressMappingByEVMAddress(QueryAddressMappingByEVMAddressRequest) returns (QueryAddressMappingByEVMAddressResponse) {
-        option (google.api.http).get = "/sommelier/addressmap/v1/address_mappings/evm/{evm_address}";
+        option (google.api.http).get = "/sommelier/addresses/v1/address_mappings/evm/{evm_address}";
     }
 
     rpc QueryAddressMappingByCosmosAddress(QueryAddressMappingByCosmosAddressRequest) returns (QueryAddressMappingByCosmosAddressResponse) {
-        option (google.api.http).get = "/sommelier/addressmap/v1/address_mappings/cosmos/{cosmos_address}";
+        option (google.api.http).get = "/sommelier/addresses/v1/address_mappings/cosmos/{cosmos_address}";
     }
 }
 

diff --git a/proto/addressmap/v1/tx.proto → proto/addresses/v1/tx.proto b/proto/addressmap/v1/tx.proto → proto/addresses/v1/tx.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
-package addressmap.v1;
+package addresses.v1;
 
-option go_package = "github.com/peggyjv/sommelier/v7/x/addressmap/types/v1";
+option go_package = "github.com/peggyjv/sommelier/v7/x/addresses/types/v1";
 
 service Msg {
     // Adds a mapping between the cosmos address of the sender and the provided EVM address

diff --git a/proto/addressmap/v1/genesis.proto b/proto/addressmap/v1/genesis.proto
diff --git a/x/addressmap/types/v1/addressmap.pb.go → x/addresses/types/v1/addresses.pb.go b/x/addressmap/types/v1/addressmap.pb.go → x/addresses/types/v1/addresses.pb.go
diff --git a/x/addressmap/types/v1/genesis.pb.go → x/addresses/types/v1/genesis.pb.go b/x/addressmap/types/v1/genesis.pb.go → x/addresses/types/v1/genesis.pb.go