From c6e494640d2d317ba5e26e12718ea58fa0154eda Mon Sep 17 00:00:00 2001
From: Riccardo Montagnin <riccardo.montagnin@gmail.com>
Date: Wed, 1 Jun 2022 07:20:42 +0200
Subject: [PATCH] fixed conflicts

Signed-off-by: Riccardo Montagnin <riccardo.montagnin@gmail.com>
---
 x/posts/keeper/genesis.go     | 2 +-
 x/posts/types/genesis_test.go | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/x/posts/keeper/genesis.go b/x/posts/keeper/genesis.go
index 3bdb2c4916..6e29218643 100644
--- a/x/posts/keeper/genesis.go
+++ b/x/posts/keeper/genesis.go
@@ -63,7 +63,7 @@ func (k Keeper) getAllAttachments(ctx sdk.Context) []types.Attachment {
 // getAllActivePollsData returns the active polls data
 func (k Keeper) getAllActivePollsData(ctx sdk.Context) []types.ActivePollData {
 	var data []types.ActivePollData
-	k.IterateActivePolls(ctx, func(index int64, poll types.Attachment) (stop bool) {
+	k.IterateActivePolls(ctx, func(poll types.Attachment) (stop bool) {
 		data = append(data, types.NewActivePollData(
 			poll.SubspaceID,
 			poll.PostID,
diff --git a/x/posts/types/genesis_test.go b/x/posts/types/genesis_test.go
index 8c419914f3..b6aaff0e67 100644
--- a/x/posts/types/genesis_test.go
+++ b/x/posts/types/genesis_test.go
@@ -368,6 +368,7 @@ func TestGenesisPost_Validate(t *testing.T) {
 			name: "invalid initial attachment id returns error",
 			post: types.NewGenesisPost(0, types.NewPost(
 				1,
+				0,
 				1,
 				"External id",
 				"Text",
@@ -384,6 +385,7 @@ func TestGenesisPost_Validate(t *testing.T) {
 		{
 			name: "invalid post returns error",
 			post: types.NewGenesisPost(1, types.NewPost(
+				0,
 				0,
 				1,
 				"External id",
@@ -402,6 +404,7 @@ func TestGenesisPost_Validate(t *testing.T) {
 			name: "valid data returns no error",
 			post: types.NewGenesisPost(1, types.NewPost(
 				1,
+				0,
 				1,
 				"External id",
 				"Text",