update scenarios and clean up

x/ecocredit/marketplace/msg_sell_test.go

@@ -26,7 +26,7 @@ func TestMsgSell(t *testing.T) {
 				Owner: a1.String(),
 				Orders: []*MsgSell_Order{
 					{
-						BatchDenom: "A00-001-00000000-00000000-000",
+						BatchDenom: "A00-000-00000000-00000000-000",
 						Quantity:   "1.5",
 						AskPrice: &sdk.Coin{
 							Denom:  "uregen",
@@ -44,7 +44,7 @@ func TestMsgSell(t *testing.T) {
 				Owner: "foobar",
 				Orders: []*MsgSell_Order{
 					{
-						BatchDenom: "A00-001-00000000-00000000-000",
+						BatchDenom: "A00-000-00000000-00000000-000",
 						Quantity:   "1.5",
 						AskPrice: &sdk.Coin{
 							Denom:  "uregen",
@@ -78,7 +78,7 @@ func TestMsgSell(t *testing.T) {
 				Owner: a1.String(),
 				Orders: []*MsgSell_Order{
 					{
-						BatchDenom: "A00-001-00000000-00000000-000",
+						BatchDenom: "A00-000-00000000-00000000-000",
 						Quantity:   "-1.5",
 						AskPrice: &sdk.Coin{
 							Denom:  "uregen",
@@ -95,7 +95,7 @@ func TestMsgSell(t *testing.T) {
 				Owner: a1.String(),
 				Orders: []*MsgSell_Order{
 					{
-						BatchDenom: "A00-001-00000000-00000000-000",
+						BatchDenom: "A00-000-00000000-00000000-000",
 						Quantity:   "1.5",
 						AskPrice: &sdk.Coin{
 							Denom:  "uregen",

x/ecocredit/server/core/create_project.go

@@ -62,23 +62,23 @@ func (k Keeper) CreateProject(ctx context.Context, req *core.MsgCreateProject) (
 // genProjectID generates a projectID when no projectID was given for CreateProject.
 // The ID is generated by concatenating the classID and a sequence number.
 func (k Keeper) genProjectID(ctx context.Context, classKey uint64, classID string) (string, error) {
-	var nextID uint64
+	var nextSeq uint64
 	projectSeqNo, err := k.stateStore.ProjectSequenceTable().Get(ctx, classKey)
 	switch err {
 	case ormerrors.NotFound:
-		nextID = 1
+		nextSeq = 1
 	case nil:
-		nextID = projectSeqNo.NextSequence
+		nextSeq = projectSeqNo.NextSequence
 	default:
 		return "", err
 	}
 
 	if err = k.stateStore.ProjectSequenceTable().Save(ctx, &api.ProjectSequence{
 		ClassKey:     classKey,
-		NextSequence: nextID + 1,
+		NextSequence: nextSeq + 1,
 	}); err != nil {
 		return "", err
 	}
 
-	return core.FormatProjectId(classID, nextID), nil
+	return core.FormatProjectId(classID, nextSeq), nil
 }

x/ecocredit/server/core/features/msg_create_batch.feature

@@ -6,19 +6,21 @@ Feature: CreateBatch
 
   Rule: A credit batch denom is always unique
 
-    Background:
+    Scenario: multiple credit batches from the same project
+      Given a credit type exists with abbreviation "A"
+      And alice has created a credit class with credit type "A"
+      And alice has created a project with credit class id "A01"
+      And alice has created a credit batch with project id "A01-001"
+      When alice creates a credit batch with project id "A01-001"
+      Then the credit batch exists with denom "A01-001-20200101-20210101-002"
+
+    Scenario: multiple credit batches from different projects
       Given a credit type exists with abbreviation "A"
       And a credit type exists with abbreviation "B"
       And alice has created a credit class with credit type "A"
       And alice has created a credit class with credit type "B"
       And alice has created a project with credit class id "A01"
       And alice has created a project with credit class id "B01"
-
-    Scenario: credit batches with one project
-      When alice creates a credit batch with project id "A01-001"
-      Then the credit batch exists with denom "A01-001-20200101-20210101-001"
-
-    Scenario: credit batches with multiple projects
-      Given alice has created a credit batch with project id "A01-001"
+      And alice has created a credit batch with project id "A01-001"
       When alice creates a credit batch with project id "B01-001"
       Then the credit batch exists with denom "B01-001-20200101-20210101-001"

x/ecocredit/server/core/features/msg_create_project.feature

@@ -6,10 +6,27 @@ Feature: CreateProject
 
   Rule: A project id is always unique
 
-    Scenario Outline: the project id is auto-generated
+    Scenario: two projects from the same credit class
       Given a credit type exists with abbreviation "A"
       And alice has created a credit class with credit type "A"
-      And the project sequence number is "<next_sequence>"
+      And alice has created a project with credit class id "A01"
+      When alice creates a project with credit class id "A01"
+      Then the project exists with project id "A01-002"
+
+    Scenario: two projects from different credit classes
+      Given a credit type exists with abbreviation "A"
+      And a credit type exists with abbreviation "B"
+      And alice has created a credit class with credit type "A"
+      And alice has created a credit class with credit type "B"
+      And alice has created a project with credit class id "A01"
+      And alice has created a project with credit class id "B01"
+      When alice creates a project with credit class id "B01"
+      Then the project exists with project id "B01-001"
+
+    Scenario Outline: project id is formatted correctly
+      Given a credit type exists with abbreviation "A"
+      And alice has created a credit class with credit type "A"
+      And the project sequence for credit class "A01" is "<next_sequence>"
       When alice creates a project with credit class id "A01"
       Then the project exists with project id "<project_id>"
 

x/ecocredit/server/core/msg_create_batch_test.go

@@ -16,9 +16,8 @@ import (
 
 type createBatchSuite struct {
 	*baseSuite
-	alice   sdk.AccAddress
-	classId string
-	err     error
+	alice sdk.AccAddress
+	err   error
 }
 
 func TestCreateBatch(t *testing.T) {
@@ -54,15 +53,13 @@ func (s *createBatchSuite) AliceHasCreatedACreditClassWithCreditType(a string) {
 
 	s.bankKeeper.EXPECT().BurnCoins(gmAny, gmAny, gmAny).Return(nil).AnyTimes()
 
-	res, err := s.k.CreateClass(s.ctx, &core.MsgCreateClass{
+	_, err := s.k.CreateClass(s.ctx, &core.MsgCreateClass{
 		Admin:            s.alice.String(),
 		Issuers:          []string{s.alice.String()},
 		CreditTypeAbbrev: a,
 		Fee:              &fee,
 	})
 	require.NoError(s.t, err)
-
-	s.classId = res.ClassId
 }
 
 func (s *createBatchSuite) AliceHasCreatedAProjectWithCreditClassId(a string) {

x/ecocredit/server/core/msg_create_project_test.go

@@ -16,9 +16,8 @@ import (
 
 type createProjectSuite struct {
 	*baseSuite
-	alice   sdk.AccAddress
-	classId string
-	err     error
+	alice sdk.AccAddress
+	err   error
 }
 
 func TestCreateProject(t *testing.T) {
@@ -54,22 +53,28 @@ func (s *createProjectSuite) AliceHasCreatedACreditClassWithCreditType(a string)
 
 	s.bankKeeper.EXPECT().BurnCoins(gmAny, gmAny, gmAny).Return(nil).AnyTimes()
 
-	res, err := s.k.CreateClass(s.ctx, &core.MsgCreateClass{
+	_, err := s.k.CreateClass(s.ctx, &core.MsgCreateClass{
 		Admin:            s.alice.String(),
 		Issuers:          []string{s.alice.String()},
 		CreditTypeAbbrev: a,
 		Fee:              &fee,
 	})
 	require.NoError(s.t, err)
+}
 
-	s.classId = res.ClassId
+func (s *createProjectSuite) AliceHasCreatedAProjectWithCreditClassId(a string) {
+	_, s.err = s.k.CreateProject(s.ctx, &core.MsgCreateProject{
+		Issuer:       s.alice.String(),
+		ClassId:      a,
+		Jurisdiction: "US",
+	})
 }
 
-func (s *createProjectSuite) TheProjectSequenceNumberIs(a string) {
-	nextSequence, err := strconv.ParseUint(a, 10, 32)
+func (s *createProjectSuite) TheProjectSequenceForCreditClassIs(a, b string) {
+	class, err := s.k.stateStore.ClassTable().GetById(s.ctx, a)
 	require.NoError(s.t, err)
 
-	class, err := s.k.stateStore.ClassTable().GetById(s.ctx, s.classId)
+	nextSequence, err := strconv.ParseUint(b, 10, 32)
 	require.NoError(s.t, err)
 
 	err = s.k.stateStore.ProjectSequenceTable().Insert(s.ctx, &api.ProjectSequence{