Leonardo/users relationship impl

CHANGELOG.md

@@ -2,6 +2,7 @@
 ##Changes
 - Allowed the possibility to edit a post's attachments and poll data using the `MsgEditPost` type (#202)
 - Removed the `Open` field from within the `PollData` object. Now you should rely on the `CloseDate` field to determine whether a poll is closed or open. (#252)
+- Implemented users `Relationships` (#168)
 
 # Version 0.10.0
 ## Changes

app/params/weights.go

@@ -2,13 +2,18 @@ package params
 
 // Default simulation operation weights for messages
 const (
-	DefaultWeightMsgCreatePost       int = 100
-	DefaultWeightMsgEditPost         int = 100
-	DefaultWeightMsgAddReaction      int = 100
-	DefaultWeightMsgRemoveReaction   int = 100
-	DefaultWeightMsgAnswerPoll       int = 100
-	DefaultWeightMsgRegisterReaction int = 100
-	DefaultWeightMsgSaveAccount      int = 100
-	DefaultWeightMsgDeleteAccount    int = 100
-	DefaultWeightMsgReportPost       int = 100
+	DefaultWeightMsgCreatePost          int = 100
+	DefaultWeightMsgEditPost            int = 100
+	DefaultWeightMsgAddReaction         int = 100
+	DefaultWeightMsgRemoveReaction      int = 100
+	DefaultWeightMsgAnswerPoll          int = 100
+	DefaultWeightMsgRegisterReaction    int = 100
+	DefaultWeightMsgSaveAccount         int = 100
+	DefaultWeightMsgDeleteAccount       int = 100
+	DefaultWeightMsgReportPost          int = 100
+	DefaultWeightMsgCreateRelationship  int = 100
+	DefaultWeightMsgRequestRelationship int = 100
+	DefaultWeightMsgAcceptRelationship  int = 100
+	DefaultWeightMsgDenyRelationship    int = 100
+	DefaultWeightMsgDeleteRelationship  int = 100
 )

app/sim_test.go

@@ -3,6 +3,7 @@ package app
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/desmos-labs/desmos/x/profiles/types/models"
 	"math/rand"
 	"os"
 	"path/filepath"
@@ -17,7 +18,6 @@ import (
 
 	magpieTypes "github.com/desmos-labs/desmos/x/magpie/types"
 	postsTypes "github.com/desmos-labs/desmos/x/posts/types"
-	profilesTypes "github.com/desmos-labs/desmos/x/profiles/types"
 	reportsTypes "github.com/desmos-labs/desmos/x/reports/types"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
@@ -192,7 +192,7 @@ func TestAppImportExport(t *testing.T) {
 
 		{app.keys[magpieTypes.StoreKey], newApp.keys[magpieTypes.StoreKey], [][]byte{}},
 		{app.keys[postsTypes.StoreKey], newApp.keys[postsTypes.StoreKey], [][]byte{}},
-		{app.keys[profilesTypes.StoreKey], newApp.keys[profilesTypes.StoreKey], [][]byte{}},
+		{app.keys[models.StoreKey], newApp.keys[models.StoreKey], [][]byte{}},
 		{app.keys[reportsTypes.StoreKey], newApp.keys[reportsTypes.StoreKey], [][]byte{}},
 	}
 

cli_test/cli_profile_test.go

@@ -4,6 +4,7 @@
 package clitest
 
 import (
+	"github.com/desmos-labs/desmos/x/profiles/types"
 	"testing"
 
 	"github.com/cosmos/cosmos-sdk/tests"
@@ -327,3 +328,114 @@ func TestDesmosCLIProfileDelete(t *testing.T) {
 
 	f.Cleanup()
 }
+
+func TestDesmosCLICreateMonoDirectionalRelationship(t *testing.T) {
+	t.Parallel()
+	f := InitFixtures(t)
+
+	// Start Desmosd server
+	proc := f.GDStart()
+	defer proc.Stop(false)
+
+	// Save key addresses for later use
+	fooAddr := f.KeyAddress(keyFoo)
+
+	// Later usage variables
+	fooAcc := f.QueryAccount(fooAddr)
+	startTokens := sdk.TokensFromConsensusPower(140)
+	require.Equal(t, startTokens, fooAcc.GetCoins().AmountOf(denom))
+	receiver, err := sdk.AccAddressFromBech32("desmos15ux5mc98jlhsg30dzwwv06ftjs82uy4g3t99ru")
+	require.NoError(t, err)
+
+	// Create mono directional relationship
+	success, _, sterr := f.TxCreateMonoDirectionalRelationship(receiver, fooAddr, "-y")
+	require.True(t, success)
+	require.Empty(t, sterr)
+	tests.WaitForNextNBlocksTM(1, f.Port)
+
+	// Make sure relationship is created
+	storedRelationships := f.QueryRelationships(fooAddr)
+	require.NotEmpty(t, storedRelationships)
+	expRelationship := types.NewRelationshipResponse([]sdk.AccAddress{receiver})
+	require.Equal(t, expRelationship, storedRelationships)
+
+	// Delete the relationship to perform other tests
+	success, _, sterr = f.TxDeleteUserRelationship(receiver, fooAddr, "-y")
+	require.True(t, success)
+	require.Empty(t, sterr)
+	tests.WaitForNextNBlocksTM(1, f.Port)
+
+	// Test --dry-tun
+	success, _, _ = f.TxCreateMonoDirectionalRelationship(receiver, fooAddr, "--dry-run")
+	require.True(t, success)
+
+	// Test --generate-only
+	success, stdout, stderr := f.TxCreateMonoDirectionalRelationship(receiver, fooAddr, "--generate-only=true")
+	require.Empty(t, stderr)
+	require.True(t, success)
+	msg := unmarshalStdTx(f.T, stdout)
+	require.NotZero(t, msg.Fee.Gas)
+	require.Len(t, msg.Msgs, 1)
+	require.Len(t, msg.GetSignatures(), 0)
+
+	f.Cleanup()
+}
+
+func TestDesmosCLIDeleteRelationship(t *testing.T) {
+	t.Parallel()
+	f := InitFixtures(t)
+
+	// Start Desmosd server
+	proc := f.GDStart()
+	defer proc.Stop(false)
+
+	// Save key addresses for later use
+	fooAddr := f.KeyAddress(keyFoo)
+
+	// Later usage variables
+	fooAcc := f.QueryAccount(fooAddr)
+	startTokens := sdk.TokensFromConsensusPower(140)
+	require.Equal(t, startTokens, fooAcc.GetCoins().AmountOf(denom))
+	receiver, err := sdk.AccAddressFromBech32("desmos15ux5mc98jlhsg30dzwwv06ftjs82uy4g3t99ru")
+	require.NoError(t, err)
+
+	// Create mono directional relationship
+	success, _, sterr := f.TxCreateMonoDirectionalRelationship(receiver, fooAddr, "-y")
+	require.True(t, success)
+	require.Empty(t, sterr)
+	tests.WaitForNextNBlocksTM(1, f.Port)
+
+	// Make sure relationship is created
+	storedRelationships := f.QueryRelationships(fooAddr)
+	require.NotEmpty(t, storedRelationships)
+	expRelationship := types.NewRelationshipResponse([]sdk.AccAddress{receiver})
+	require.Equal(t, expRelationship, storedRelationships)
+
+	// Delete the relationship to perform other tests
+	success, _, sterr = f.TxDeleteUserRelationship(receiver, fooAddr, "-y")
+	require.True(t, success)
+	require.Empty(t, sterr)
+	tests.WaitForNextNBlocksTM(1, f.Port)
+
+	// Make sure relationship is deleted
+	storedRelationships = f.QueryRelationships(fooAddr)
+	require.Empty(t, storedRelationships)
+
+	// Create mono directional relationship
+	success, _, sterr = f.TxCreateMonoDirectionalRelationship(receiver, fooAddr, "-y")
+
+	// Test --dry-tun
+	success, _, _ = f.TxDeleteUserRelationship(receiver, fooAddr, "--dry-run")
+	require.True(t, success)
+
+	// Test --generate-only
+	success, stdout, stderr := f.TxDeleteUserRelationship(receiver, fooAddr, "--generate-only=true")
+	require.Empty(t, stderr)
+	require.True(t, success)
+	msg := unmarshalStdTx(f.T, stdout)
+	require.NotZero(t, msg.Fee.Gas)
+	require.Len(t, msg.Msgs, 1)
+	require.Len(t, msg.GetSignatures(), 0)
+
+	f.Cleanup()
+}

cli_test/test_helpers.go

@@ -24,11 +24,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	"github.com/cosmos/cosmos-sdk/x/staking"
+	"github.com/desmos-labs/desmos/x/profiles/types"
 	"github.com/stretchr/testify/require"
 
 	"github.com/desmos-labs/desmos/app"
 	postsTypes "github.com/desmos-labs/desmos/x/posts/types"
-	profileTypes "github.com/desmos-labs/desmos/x/profiles/types"
 	reportsTypes "github.com/desmos-labs/desmos/x/reports/types"
 )
 
@@ -467,6 +467,18 @@ func (f *Fixtures) TxProfileDelete(from sdk.AccAddress, flags ...string) (bool,
 	return executeWriteRetStdStreams(f.T, addFlags(cmd, flags), clientkeys.DefaultKeyPass)
 }
 
+func (f *Fixtures) TxCreateMonoDirectionalRelationship(receiver, from sdk.AccAddress, flags ...string) (bool, string, string) {
+	cmd := fmt.Sprintf(`%s tx profiles create-relationship %s --keyring-backend=test --from=%s %v`,
+		f.DesmoscliBinary, receiver, from, f.Flags())
+	return executeWriteRetStdStreams(f.T, addFlags(cmd, flags), clientkeys.DefaultKeyPass)
+}
+
+func (f *Fixtures) TxDeleteUserRelationship(receiver, from sdk.AccAddress, flags ...string) (bool, string, string) {
+	cmd := fmt.Sprintf(`%s tx profiles delete-relationship %s --keyring-backend=test --from=%s %v`,
+		f.DesmoscliBinary, receiver, from, f.Flags())
+	return executeWriteRetStdStreams(f.T, addFlags(cmd, flags), clientkeys.DefaultKeyPass)
+}
+
 //___________________________________________________________________________________
 // desmoscli tx reports
 
@@ -791,17 +803,29 @@ func (f *Fixtures) QueryReactions(flags ...string) postsTypes.Reactions {
 // query profile
 
 // QueryProfile returns stored profiles
-func (f *Fixtures) QueryProfiles(flags ...string) profileTypes.Profiles {
+func (f *Fixtures) QueryProfiles(flags ...string) types.Profiles {
 	cmd := fmt.Sprintf("%s query profiles all --output=json %s", f.DesmoscliBinary, f.Flags())
 	res, errStr := tests.ExecuteT(f.T, addFlags(cmd, flags), "")
 	require.Empty(f.T, errStr)
 	cdc := app.MakeCodec()
-	var storedProfile profileTypes.Profiles
+	var storedProfile types.Profiles
 	err := cdc.UnmarshalJSON([]byte(res), &storedProfile)
 	require.NoError(f.T, err)
 	return storedProfile
 }
 
+// QueryRelationships returns stored relationships
+func (f *Fixtures) QueryRelationships(user sdk.AccAddress, flags ...string) types.RelationshipsResponse {
+	cmd := fmt.Sprintf("%s query profiles relationships %s --output=json %s", f.DesmoscliBinary, user, f.Flags())
+	res, errStr := tests.ExecuteT(f.T, addFlags(cmd, flags), "")
+	require.Empty(f.T, errStr)
+	cdc := app.MakeCodec()
+	var storedRelationships types.RelationshipsResponse
+	err := cdc.UnmarshalJSON([]byte(res), &storedRelationships)
+	require.NoError(f.T, err)
+	return storedRelationships
+}
+
 //___________________________________________________________________________________
 // query reports
 

cmd/desmoscli/main.go

@@ -40,7 +40,7 @@ func main() {
 	}
 
 	// Add --chain-id to persistent flags and mark it required
-	rootCmd.PersistentFlags().String(flags.FlagChainID, "", "Chain ID of tendermint node")
+	rootCmd.PersistentFlags().String(flags.FlagChainID, "", "Chain RelationshipID of tendermint node")
 	rootCmd.PersistentPreRunE = func(_ *cobra.Command, _ []string) error {
 		return initConfig(rootCmd)
 	}

x/magpie/keeper/keeper_test.go

@@ -77,11 +77,11 @@ func (suite *KeeperTestSuite) TestKeeper_GetLastSessionID() {
 		expID      types.SessionID
 	}{
 		{
-			name:  "First ID is returned properly",
+			name:  "First RelationshipID is returned properly",
 			expID: types.SessionID(0),
 		},
 		{
-			name:       "Existing ID is returned properly",
+			name:       "Existing RelationshipID is returned properly",
 			existingID: types.SessionID(18446744073709551615),
 			expID:      types.SessionID(18446744073709551615),
 		},

x/magpie/legacy/v0.2.0/types.go

@@ -23,7 +23,7 @@ type SessionID uint64
 
 // Session is a struct of a user session
 type Session struct {
-	SessionID     SessionID      `json:"id,string"`              // Id of the session
+	SessionID     SessionID      `json:"id,string"`              // RelationshipID of the session
 	Owner         sdk.AccAddress `json:"owner"`                  // Desmos owner of this session
 	Created       int64          `json:"creation_time,string"`   // Block height at which the session has been created
 	Expiry        int64          `json:"expiration_time,string"` // Block height at which the session will expire

x/magpie/legacy/v0.3.0/types.go

@@ -25,7 +25,7 @@ type SessionID uint64
 
 // Session is a struct of a user session
 type Session struct {
-	SessionID     SessionID      `json:"id,string"`              // Id of the session
+	SessionID     SessionID      `json:"id,string"`              // RelationshipID of the session
 	Owner         sdk.AccAddress `json:"owner"`                  // Desmos owner of this session
 	Created       int64          `json:"creation_time,string"`   // Block height at which the session has been created
 	Expiry        int64          `json:"expiration_time,string"` // Block height at which the session will expire

x/magpie/types/session.go

@@ -47,7 +47,7 @@ func ParseSessionID(value string) (SessionID, error) {
 
 // Session is a struct of a user session
 type Session struct {
-	SessionID     SessionID      `json:"id,string" yaml:"id,string"`                    // Id of the session
+	SessionID     SessionID      `json:"id,string" yaml:"id,string"`                    // RelationshipID of the session
 	Owner         sdk.AccAddress `json:"owner" yaml:"owner"`                            // Desmos owner of this session
 	Created       int64          `json:"creation_time,string" yaml:"creation_time"`     // Block height at which the session has been created
 	Expiry        int64          `json:"expiration_time,string" yaml:"expiration_time"` // Block height at which the session will expire

x/magpie/types/session_test.go

@@ -90,18 +90,18 @@ func TestParseSessionID(t *testing.T) {
 		expErr bool
 	}{
 		{
-			name:   "ID 0 is parsed correctly",
+			name:   "RelationshipID 0 is parsed correctly",
 			string: "0",
 			expID:  types.SessionID(0),
 		},
 		{
-			name:   "Negative ID returns error",
+			name:   "Negative RelationshipID returns error",
 			string: "-1",
 			expID:  types.SessionID(0),
 			expErr: true,
 		},
 		{
-			name:   "Positive ID is parsed correctly",
+			name:   "Positive RelationshipID is parsed correctly",
 			string: "54624",
 			expID:  types.SessionID(54624),
 		},
@@ -148,7 +148,7 @@ func TestSession_Equals(t *testing.T) {
 		expEquals bool
 	}{
 		{
-			name: "Different session ID",
+			name: "Different session RelationshipID",
 			first: types.Session{
 				SessionID:     0,
 				Owner:         owner,

x/posts/client/cli/tx.go

@@ -248,7 +248,7 @@ E.g.
 	}
 
 	cmd.Flags().Bool(flagAllowsComments, true, "Possibility to comment the post or not")
-	cmd.Flags().String(flagParentID, "", "Id of the post to which this one should be an answer to")
+	cmd.Flags().String(flagParentID, "", "ID of the post to which this one should be an answer to")
 	cmd.Flags().StringArray(flagAttachment, []string{}, "Current post's attachment")
 	cmd.Flags().StringToString(flagPollDetails, map[string]string{}, "Current post's poll details")
 	cmd.Flags().StringSlice(flagPollAnswer, []string{}, "Current post's poll answer")

x/posts/legacy/v0.1.0/types.go

@@ -32,5 +32,5 @@ type Post struct {
 // Reaction is a struct of a user like
 type Like struct {
 	Created sdk.Int        `json:"created"` // Block height at which the like was created
-	Owner   sdk.AccAddress `json:"owner"`   // User that has inserted the like
+	Owner   sdk.AccAddress `json:"owner"`   // Sender that has inserted the like
 }

x/posts/legacy/v0.2.0/types.go

@@ -69,6 +69,6 @@ func (p Post) ContentsEquals(other Post) bool {
 
 // Reaction is a struct of a user reaction to a post
 type Reaction struct {
-	Owner sdk.AccAddress `json:"owner"` // User that has created the reaction
+	Owner sdk.AccAddress `json:"owner"` // Sender that has created the reaction
 	Value string         `json:"value"` // Value of the reaction
 }

x/posts/legacy/v0.3.0/types.go

@@ -148,7 +148,7 @@ type Post struct {
 
 // Reaction is a struct of a user reaction to a post
 type Reaction struct {
-	Owner sdk.AccAddress `json:"owner"` // User that has created the reaction
+	Owner sdk.AccAddress `json:"owner"` // Sender that has created the reaction
 	Value string         `json:"value"` // Value of the reaction
 }