fix merge

Aliceyyy5539 · Aug 6, 2023 · e1780e7 · e1780e7
1 parent deb1479
commit e1780e7
Show file tree

Hide file tree

Showing 125 changed files with 2,170 additions and 2,284 deletions.
diff --git a/common/types/fixationEntry.pb.go b/common/types/fixationEntry.pb.go
diff --git a/proto/lava/common/fixationEntry.proto → ...o/lavanet/lava/common/fixationEntry.proto b/proto/lava/common/fixationEntry.proto → ...o/lavanet/lava/common/fixationEntry.proto
diff --git a/proto/lava/conflict/conflict_data.proto → ...lavanet/lava/conflict/conflict_data.proto b/proto/lava/conflict/conflict_data.proto → ...lavanet/lava/conflict/conflict_data.proto
diff --git a/proto/lava/conflict/conflict_vote.proto → ...lavanet/lava/conflict/conflict_vote.proto b/proto/lava/conflict/conflict_vote.proto → ...lavanet/lava/conflict/conflict_vote.proto
diff --git a/proto/lava/conflict/genesis.proto → proto/lavanet/lava/conflict/genesis.proto b/proto/lava/conflict/genesis.proto → proto/lavanet/lava/conflict/genesis.proto
diff --git a/proto/lava/conflict/params.proto → proto/lavanet/lava/conflict/params.proto b/proto/lava/conflict/params.proto → proto/lavanet/lava/conflict/params.proto
diff --git a/proto/lava/conflict/query.proto → proto/lavanet/lava/conflict/query.proto b/proto/lava/conflict/query.proto → proto/lavanet/lava/conflict/query.proto
diff --git a/proto/lava/conflict/tx.proto → proto/lavanet/lava/conflict/tx.proto b/proto/lava/conflict/tx.proto → proto/lavanet/lava/conflict/tx.proto
diff --git a/proto/lava/downtime/v1/downtime.proto → ...o/lavanet/lava/downtime/v1/downtime.proto b/proto/lava/downtime/v1/downtime.proto → ...o/lavanet/lava/downtime/v1/downtime.proto
diff --git a/proto/lava/downtime/v1/genesis.proto → proto/lavanet/lava/downtime/v1/genesis.proto b/proto/lava/downtime/v1/genesis.proto → proto/lavanet/lava/downtime/v1/genesis.proto
diff --git a/proto/lava/downtime/v1/query.proto → proto/lavanet/lava/downtime/v1/query.proto b/proto/lava/downtime/v1/query.proto → proto/lavanet/lava/downtime/v1/query.proto
diff --git a/proto/lava/epochstorage/endpoint.proto → .../lavanet/lava/epochstorage/endpoint.proto b/proto/lava/epochstorage/endpoint.proto → .../lavanet/lava/epochstorage/endpoint.proto
diff --git a/proto/lava/epochstorage/epoch_details.proto → ...net/lava/epochstorage/epoch_details.proto b/proto/lava/epochstorage/epoch_details.proto → ...net/lava/epochstorage/epoch_details.proto
diff --git a/proto/lava/epochstorage/fixated_params.proto → ...et/lava/epochstorage/fixated_params.proto b/proto/lava/epochstorage/fixated_params.proto → ...et/lava/epochstorage/fixated_params.proto
diff --git a/proto/lava/epochstorage/genesis.proto → ...o/lavanet/lava/epochstorage/genesis.proto b/proto/lava/epochstorage/genesis.proto → ...o/lavanet/lava/epochstorage/genesis.proto
diff --git a/proto/lava/epochstorage/params.proto → proto/lavanet/lava/epochstorage/params.proto b/proto/lava/epochstorage/params.proto → proto/lavanet/lava/epochstorage/params.proto
diff --git a/proto/lava/epochstorage/query.proto → proto/lavanet/lava/epochstorage/query.proto b/proto/lava/epochstorage/query.proto → proto/lavanet/lava/epochstorage/query.proto
diff --git a/proto/lava/epochstorage/stake_entry.proto → ...vanet/lava/epochstorage/stake_entry.proto b/proto/lava/epochstorage/stake_entry.proto → ...vanet/lava/epochstorage/stake_entry.proto
diff --git a/proto/lava/epochstorage/stake_storage.proto → ...net/lava/epochstorage/stake_storage.proto b/proto/lava/epochstorage/stake_storage.proto → ...net/lava/epochstorage/stake_storage.proto
diff --git a/proto/lava/epochstorage/tx.proto → proto/lavanet/lava/epochstorage/tx.proto b/proto/lava/epochstorage/tx.proto → proto/lavanet/lava/epochstorage/tx.proto
diff --git a/proto/lava/pairing/badges.proto → proto/lavanet/lava/pairing/badges.proto b/proto/lava/pairing/badges.proto → proto/lavanet/lava/pairing/badges.proto
diff --git a/proto/lava/pairing/epoch_payments.proto → ...lavanet/lava/pairing/epoch_payments.proto b/proto/lava/pairing/epoch_payments.proto → ...lavanet/lava/pairing/epoch_payments.proto
diff --git a/proto/lava/pairing/genesis.proto → proto/lavanet/lava/pairing/genesis.proto b/proto/lava/pairing/genesis.proto → proto/lavanet/lava/pairing/genesis.proto
diff --git a/proto/lava/pairing/params.proto → proto/lavanet/lava/pairing/params.proto b/proto/lava/pairing/params.proto → proto/lavanet/lava/pairing/params.proto
diff --git a/...va/pairing/provider_payment_storage.proto → ...va/pairing/provider_payment_storage.proto b/...va/pairing/provider_payment_storage.proto → ...va/pairing/provider_payment_storage.proto
diff --git a/proto/lava/pairing/query.proto → proto/lavanet/lava/pairing/query.proto b/proto/lava/pairing/query.proto → proto/lavanet/lava/pairing/query.proto
diff --git a/proto/lava/pairing/relay.proto → proto/lavanet/lava/pairing/relay.proto b/proto/lava/pairing/relay.proto → proto/lavanet/lava/pairing/relay.proto
diff --git a/proto/lava/pairing/relayCache.proto → proto/lavanet/lava/pairing/relayCache.proto b/proto/lava/pairing/relayCache.proto → proto/lavanet/lava/pairing/relayCache.proto
diff --git a/proto/lava/pairing/tx.proto → proto/lavanet/lava/pairing/tx.proto b/proto/lava/pairing/tx.proto → proto/lavanet/lava/pairing/tx.proto
diff --git a/...que_payment_storage_client_provider.proto → ...que_payment_storage_client_provider.proto b/...que_payment_storage_client_provider.proto → ...que_payment_storage_client_provider.proto
diff --git a/proto/lava/plans/genesis.proto → proto/lavanet/lava/plans/genesis.proto b/proto/lava/plans/genesis.proto → proto/lavanet/lava/plans/genesis.proto
diff --git a/proto/lava/plans/params.proto → proto/lavanet/lava/plans/params.proto b/proto/lava/plans/params.proto → proto/lavanet/lava/plans/params.proto
diff --git a/proto/lava/plans/plan.proto → proto/lavanet/lava/plans/plan.proto b/proto/lava/plans/plan.proto → proto/lavanet/lava/plans/plan.proto
diff --git a/proto/lava/plans/plans_proposal.proto → ...o/lavanet/lava/plans/plans_proposal.proto b/proto/lava/plans/plans_proposal.proto → ...o/lavanet/lava/plans/plans_proposal.proto
diff --git a/proto/lava/plans/policy.proto → proto/lavanet/lava/plans/policy.proto b/proto/lava/plans/policy.proto → proto/lavanet/lava/plans/policy.proto
diff --git a/proto/lava/plans/query.proto → proto/lavanet/lava/plans/query.proto b/proto/lava/plans/query.proto → proto/lavanet/lava/plans/query.proto
diff --git a/proto/lava/plans/tx.proto → proto/lavanet/lava/plans/tx.proto b/proto/lava/plans/tx.proto → proto/lavanet/lava/plans/tx.proto
diff --git a/proto/lava/projects/genesis.proto → proto/lavanet/lava/projects/genesis.proto b/proto/lava/projects/genesis.proto → proto/lavanet/lava/projects/genesis.proto
diff --git a/proto/lava/projects/params.proto → proto/lavanet/lava/projects/params.proto b/proto/lava/projects/params.proto → proto/lavanet/lava/projects/params.proto
diff --git a/proto/lava/projects/project.proto → proto/lavanet/lava/projects/project.proto b/proto/lava/projects/project.proto → proto/lavanet/lava/projects/project.proto
diff --git a/proto/lava/projects/query.proto → proto/lavanet/lava/projects/query.proto b/proto/lava/projects/query.proto → proto/lavanet/lava/projects/query.proto
diff --git a/proto/lava/projects/tx.proto → proto/lavanet/lava/projects/tx.proto b/proto/lava/projects/tx.proto → proto/lavanet/lava/projects/tx.proto
diff --git a/proto/lava/protocol/genesis.proto → proto/lavanet/lava/protocol/genesis.proto b/proto/lava/protocol/genesis.proto → proto/lavanet/lava/protocol/genesis.proto
diff --git a/proto/lava/protocol/params.proto → proto/lavanet/lava/protocol/params.proto b/proto/lava/protocol/params.proto → proto/lavanet/lava/protocol/params.proto
diff --git a/proto/lava/protocol/query.proto → proto/lavanet/lava/protocol/query.proto b/proto/lava/protocol/query.proto → proto/lavanet/lava/protocol/query.proto
diff --git a/proto/lava/protocol/tx.proto → proto/lavanet/lava/protocol/tx.proto b/proto/lava/protocol/tx.proto → proto/lavanet/lava/protocol/tx.proto
diff --git a/proto/lava/spec/api_collection.proto → proto/lavanet/lava/spec/api_collection.proto b/proto/lava/spec/api_collection.proto → proto/lavanet/lava/spec/api_collection.proto
diff --git a/proto/lava/spec/genesis.proto → proto/lavanet/lava/spec/genesis.proto b/proto/lava/spec/genesis.proto → proto/lavanet/lava/spec/genesis.proto
diff --git a/proto/lava/spec/params.proto → proto/lavanet/lava/spec/params.proto b/proto/lava/spec/params.proto → proto/lavanet/lava/spec/params.proto
diff --git a/proto/lava/spec/query.proto → proto/lavanet/lava/spec/query.proto b/proto/lava/spec/query.proto → proto/lavanet/lava/spec/query.proto
diff --git a/proto/lava/spec/spec.proto → proto/lavanet/lava/spec/spec.proto b/proto/lava/spec/spec.proto → proto/lavanet/lava/spec/spec.proto
diff --git a/proto/lava/spec/spec_add_proposal.proto → ...lavanet/lava/spec/spec_add_proposal.proto b/proto/lava/spec/spec_add_proposal.proto → ...lavanet/lava/spec/spec_add_proposal.proto
diff --git a/proto/lava/spec/tx.proto → proto/lavanet/lava/spec/tx.proto b/proto/lava/spec/tx.proto → proto/lavanet/lava/spec/tx.proto
diff --git a/proto/lava/subscription/genesis.proto → ...o/lavanet/lava/subscription/genesis.proto b/proto/lava/subscription/genesis.proto → ...o/lavanet/lava/subscription/genesis.proto
diff --git a/proto/lava/subscription/params.proto → proto/lavanet/lava/subscription/params.proto b/proto/lava/subscription/params.proto → proto/lavanet/lava/subscription/params.proto
diff --git a/proto/lava/subscription/query.proto → proto/lavanet/lava/subscription/query.proto b/proto/lava/subscription/query.proto → proto/lavanet/lava/subscription/query.proto
diff --git a/proto/lava/subscription/subscription.proto → ...anet/lava/subscription/subscription.proto b/proto/lava/subscription/subscription.proto → ...anet/lava/subscription/subscription.proto
diff --git a/proto/lava/subscription/tx.proto → proto/lavanet/lava/subscription/tx.proto b/proto/lava/subscription/tx.proto → proto/lavanet/lava/subscription/tx.proto
diff --git a/x/conflict/types/conflict_data.pb.go b/x/conflict/types/conflict_data.pb.go