From 10aa17de05d5777d6b89ef4b311a5e870f5670d0 Mon Sep 17 00:00:00 2001 From: Allyson-English Date: Tue, 9 Apr 2024 10:19:03 -0600 Subject: [PATCH] clean up --- internal/controllers/nft_controller_test.go | 4 ++-- .../controllers/synthetic_devices_controller_test.go | 12 ++++++------ internal/controllers/user_devices_controller_test.go | 6 +++--- .../controllers/user_integrations_controller_test.go | 5 ++--- internal/middleware/owner/owner_test.go | 2 +- internal/services/autopi/integration_test.go | 8 ++++---- internal/test/helpers.go | 4 ++-- 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/internal/controllers/nft_controller_test.go b/internal/controllers/nft_controller_test.go index cfd8089bb..ce2bc8184 100644 --- a/internal/controllers/nft_controller_test.go +++ b/internal/controllers/nft_controller_test.go @@ -110,7 +110,7 @@ func (s *UserDevicesControllerTestSuite) TestGetBurn() { err = ud.Insert(context.Background(), s.pdb.DBS().Writer, boil.Infer()) s.Require().NoError(err) - test.SetupCreateVehicleNFT(s.T(), ud, ud.VinIdentifier.String, big.NewInt(1), null.BytesFrom(addr.Bytes()), s.pdb) + test.SetupCreateVehicleNFT(s.T(), ud, big.NewInt(1), null.BytesFrom(addr.Bytes()), s.pdb) user := test.BuildGetUserGRPC(ud.UserID, &email, ð, &pb.UserReferrer{}) s.usersClient.EXPECT().GetUser(gomock.Any(), &pb.GetUserRequest{Id: ud.UserID}).Return(user, nil) @@ -139,7 +139,7 @@ func (s *UserDevicesControllerTestSuite) TestPostBurn() { err = ud.Insert(context.Background(), s.pdb.DBS().Writer, boil.Infer()) s.Require().NoError(err) - vnft := test.SetupCreateVehicleNFT(s.T(), ud, ud.VinIdentifier.String, big.NewInt(1), null.BytesFrom(addr.Bytes()), s.pdb) + vnft := test.SetupCreateVehicleNFT(s.T(), ud, big.NewInt(1), null.BytesFrom(addr.Bytes()), s.pdb) user := test.BuildGetUserGRPC(ud.UserID, &email, ð, &pb.UserReferrer{}) s.usersClient.EXPECT().GetUser(gomock.Any(), &pb.GetUserRequest{Id: ud.UserID}).Return(user, nil) s.usersClient.EXPECT().GetUser(gomock.Any(), &pb.GetUserRequest{Id: ud.UserID}).Return(user, nil) diff --git a/internal/controllers/synthetic_devices_controller_test.go b/internal/controllers/synthetic_devices_controller_test.go index 585483641..6bc9ecba7 100644 --- a/internal/controllers/synthetic_devices_controller_test.go +++ b/internal/controllers/synthetic_devices_controller_test.go @@ -134,7 +134,7 @@ func (s *SyntheticDevicesControllerTestSuite) TestGetSyntheticDeviceMintingPaylo test.BuildDeviceDefinitionGRPC(ksuid.New().String(), "Ford", "Explorer", 2022, nil) udID := ksuid.New().String() - test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, 57, s.pdb) + test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, s.pdb) test.SetupCreateUserDeviceAPIIntegration(s.T(), "", "xddL", udID, integration.Id, s.pdb) request := test.BuildRequest("GET", fmt.Sprintf("/v1/user/devices/%s/integrations/%s/commands/mint", udID, integration.Id), "") @@ -163,7 +163,7 @@ func (s *SyntheticDevicesControllerTestSuite) TestGetSyntheticDeviceMintingPaylo test.BuildDeviceDefinitionGRPC(ksuid.New().String(), "Ford", "Explorer", 2022, nil) udID := ksuid.New().String() - test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, 57, s.pdb) + test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, s.pdb) test.SetupCreateUserDeviceAPIIntegration(s.T(), "", "xddL", udID, integration.Id, s.pdb) request := test.BuildRequest("GET", fmt.Sprintf("/v1/user/devices/%s/integrations/%s/commands/mint", udID, integration.Id), "") @@ -190,7 +190,7 @@ func (s *SyntheticDevicesControllerTestSuite) TestGetSyntheticDeviceMintingPaylo test.BuildDeviceDefinitionGRPC(ksuid.New().String(), "Ford", "Explorer", 2022, nil) udID := ksuid.New().String() - test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, 57, s.pdb) + test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, s.pdb) test.SetupCreateUserDeviceAPIIntegration(s.T(), "", "xddL", udID, integration.Id, s.pdb) request := test.BuildRequest("GET", fmt.Sprintf("/v1/user/devices/%s/integrations/%s/commands/mint", udID, integration.Id), "") @@ -219,7 +219,7 @@ func (s *SyntheticDevicesControllerTestSuite) TestGetSyntheticDeviceMintingPaylo test.BuildDeviceDefinitionGRPC(ksuid.New().String(), "Ford", "Explorer", 2022, nil) udID := ksuid.New().String() - test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, 57, s.pdb) + test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, s.pdb) test.SetupCreateUserDeviceAPIIntegration(s.T(), "", "xddL", udID, integration.Id, s.pdb) request := test.BuildRequest("GET", fmt.Sprintf("/v1/user/devices/%s/integrations/%s/commands/mint", udID, integration.Id), "") @@ -276,7 +276,7 @@ func (s *SyntheticDevicesControllerTestSuite) Test_MintSyntheticDeviceSmartcar() test.BuildDeviceDefinitionGRPC(ksuid.New().String(), "Ford", "Explorer", 2022, nil) udID := ksuid.New().String() - test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, 57, s.pdb) + test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, s.pdb) test.SetupCreateUserDeviceAPIIntegration(s.T(), "", "xddL", udID, integration.Id, s.pdb) vehicleSig := common.BytesToHash(common.HexToAddress("20").Bytes()).Bytes() @@ -379,7 +379,7 @@ func (s *SyntheticDevicesControllerTestSuite) TestSignSyntheticDeviceMintingPayl test.BuildDeviceDefinitionGRPC(ksuid.New().String(), "Ford", "Explorer", 2022, nil) udID := ksuid.New().String() - test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, 57, s.pdb) + test.SetupCreateVehicleNFTForMiddleware(s.T(), *addr, mockUserID, udID, s.pdb) test.SetupCreateUserDeviceAPIIntegration(s.T(), "", "xddL", udID, integration.Id, s.pdb) req := `{ diff --git a/internal/controllers/user_devices_controller_test.go b/internal/controllers/user_devices_controller_test.go index 443969b87..408ec3797 100644 --- a/internal/controllers/user_devices_controller_test.go +++ b/internal/controllers/user_devices_controller_test.go @@ -579,7 +579,7 @@ func (s *UserDevicesControllerTestSuite) TestGetMyUserDevices() { addr := "67B94473D81D0cd00849D563C94d0432Ac988B49" ud2 := test.SetupCreateUserDeviceWithDeviceID(s.T(), userID2, deviceID2, dd[0].DeviceDefinitionId, nil, "", s.pdb) - _ = test.SetupCreateVehicleNFT(s.T(), ud2, "vin", big.NewInt(1), null.BytesFrom(common.Hex2Bytes(addr)), s.pdb) + _ = test.SetupCreateVehicleNFT(s.T(), ud2, big.NewInt(1), null.BytesFrom(common.Hex2Bytes(addr)), s.pdb) s.usersClient.EXPECT().GetUser(gomock.Any(), &pb.GetUserRequest{Id: s.testUserID}).Return(&pb.User{Id: s.testUserID, EthereumAddress: &addr}, nil) s.deviceDefSvc.EXPECT().GetIntegrations(gomock.Any()).Return([]*ddgrpc.Integration{integration}, nil) @@ -623,7 +623,7 @@ func (s *UserDevicesControllerTestSuite) TestGetMyUserDevicesNoDuplicates() { addr := "67B94473D81D0cd00849D563C94d0432Ac988B49" - _ = test.SetupCreateVehicleNFT(s.T(), ud, "vin", big.NewInt(1), null.BytesFrom(common.Hex2Bytes(addr)), s.pdb) + _ = test.SetupCreateVehicleNFT(s.T(), ud, big.NewInt(1), null.BytesFrom(common.Hex2Bytes(addr)), s.pdb) s.usersClient.EXPECT().GetUser(gomock.Any(), &pb.GetUserRequest{Id: s.testUserID}).Return(&pb.User{Id: s.testUserID, EthereumAddress: &addr}, nil) s.deviceDefSvc.EXPECT().GetIntegrations(gomock.Any()).Return([]*ddgrpc.Integration{integration}, nil) @@ -1066,7 +1066,7 @@ func (s *UserDevicesControllerTestSuite) TestDeleteUserDevice_ErrNFTNotBurned() err = ud.Insert(context.Background(), s.pdb.DBS().Writer, boil.Infer()) s.Require().NoError(err) - test.SetupCreateVehicleNFT(s.T(), ud, ud.VinIdentifier.String, big.NewInt(1), null.BytesFrom(addr.Bytes()), s.pdb) + test.SetupCreateVehicleNFT(s.T(), ud, big.NewInt(1), null.BytesFrom(addr.Bytes()), s.pdb) request := test.BuildRequest("DELETE", "/user/devices/"+ud.ID, "") response, err := s.app.Test(request) diff --git a/internal/controllers/user_integrations_controller_test.go b/internal/controllers/user_integrations_controller_test.go index 0ce8dd171..a6c4d83c4 100644 --- a/internal/controllers/user_integrations_controller_test.go +++ b/internal/controllers/user_integrations_controller_test.go @@ -193,11 +193,10 @@ func (s *UserIntegrationsControllerTestSuite) TestPostSmartCarFailure() { func (s *UserIntegrationsControllerTestSuite) TestDeleteIntegration_BlockedBySyntheticDevice() { model := "Mach E" - const vin = "CARVIN" integration := test.BuildIntegrationGRPC(constants.SmartCarVendor, 10, 0) dd := test.BuildDeviceDefinitionGRPC(ksuid.New().String(), "Ford", model, 2020, integration) ud := test.SetupCreateUserDevice(s.T(), testUserID, dd[0].DeviceDefinitionId, nil, "", s.pdb) - vnft := test.SetupCreateVehicleNFT(s.T(), ud, vin, big.NewInt(5), null.BytesFrom(common.HexToAddress("0xA1").Bytes()), s.pdb) + vnft := test.SetupCreateVehicleNFT(s.T(), ud, big.NewInt(5), null.BytesFrom(common.HexToAddress("0xA1").Bytes()), s.pdb) mtr := models.MetaTransactionRequest{ ID: ksuid.New().String(), @@ -818,7 +817,7 @@ func (s *UserIntegrationsControllerTestSuite) TestPairAftermarketNoLegacy() { dd := test.BuildDeviceDefinitionGRPC(ksuid.New().String(), "Ford", "Explorer", 2022, nil) ud := test.SetupCreateUserDevice(s.T(), userID, dd[0].DeviceDefinitionId, nil, "4Y1SL65848Z411439", s.pdb) - _ = *test.SetupCreateVehicleNFT(s.T(), ud, ud.VinIdentifier.String, big.NewInt(4), null.BytesFrom(userAddr.Bytes()), s.pdb) + _ = *test.SetupCreateVehicleNFT(s.T(), ud, big.NewInt(4), null.BytesFrom(userAddr.Bytes()), s.pdb) aftermarketDevice := test.SetupCreateAftermarketDevice(s.T(), testUserID, common.BigToAddress(big.NewInt(2)).Bytes(), unitID, &deviceID, s.pdb) aftermarketDevice.TokenID = types.NewDecimal(decimal.New(5, 0)) diff --git a/internal/middleware/owner/owner_test.go b/internal/middleware/owner/owner_test.go index fc2931abe..54dec6af0 100644 --- a/internal/middleware/owner/owner_test.go +++ b/internal/middleware/owner/owner_test.go @@ -312,7 +312,7 @@ func TestVehicleTokenOwnerMiddleware(t *testing.T) { u := &pb.User{Id: userID} if c.OwnerAddress != common.HexToAddress("") { - _ = test.SetupCreateVehicleNFT(t, ud, "vin", big.NewInt(5), null.BytesFrom(c.OwnerAddress.Bytes()), pdb) + _ = test.SetupCreateVehicleNFT(t, ud, big.NewInt(5), null.BytesFrom(c.OwnerAddress.Bytes()), pdb) addr := c.OwnerAddress.Hex() u.EthereumAddress = &addr diff --git a/internal/services/autopi/integration_test.go b/internal/services/autopi/integration_test.go index 49cf6212f..da7ae3e05 100644 --- a/internal/services/autopi/integration_test.go +++ b/internal/services/autopi/integration_test.go @@ -100,7 +100,7 @@ func (s *IntegrationTestSuite) Test_Pair_With_DD_HardwareTemplate_Success() { _, apAddr, _ := test.GenerateWallet() autoPIUnit := test.SetupCreateMintedAftermarketDevice(s.T(), testUserID, unitID, autoPiTokenID, *apAddr, &ud.ID, s.pdb) - vehicleNFT := test.SetupCreateVehicleNFT(s.T(), ud, vin, vehicleTokenID, null.Bytes{}, s.pdb) + vehicleNFT := test.SetupCreateVehicleNFT(s.T(), ud, vehicleTokenID, null.Bytes{}, s.pdb) integration := test.BuildIntegrationGRPC(constants.AutoPiVendor, 10, 0) dd := test.BuildDeviceDefinitionGRPC(deviceDefinitionID, "Ford", "F150", 2020, integration) @@ -178,7 +178,7 @@ func (s *IntegrationTestSuite) Test_Pair_With_Make_HardwareTemplate_Success() { _, apAddr, _ := test.GenerateWallet() ud := test.SetupCreateUserDevice(s.T(), testUserID, deviceDefinitionID, nil, "", s.pdb) autoPIUnit := test.SetupCreateMintedAftermarketDevice(s.T(), testUserID, unitID, autoPiTokenID, *apAddr, &ud.ID, s.pdb) - vehicleNFT := test.SetupCreateVehicleNFT(s.T(), ud, vin, vehicleTokenID, null.Bytes{}, s.pdb) + vehicleNFT := test.SetupCreateVehicleNFT(s.T(), ud, vehicleTokenID, null.Bytes{}, s.pdb) integration := test.BuildIntegrationGRPC(constants.AutoPiVendor, 10, 0) dd := test.BuildDeviceDefinitionGRPC(deviceDefinitionID, "Ford", "F150", 2020, integration) @@ -254,7 +254,7 @@ func (s *IntegrationTestSuite) Test_Pair_With_DD_DeviceStyle_HardwareTemplate_Su _, apAddr, _ := test.GenerateWallet() autoPIUnit := test.SetupCreateMintedAftermarketDevice(s.T(), testUserID, unitID, autoPiTokenID, *apAddr, &ud.ID, s.pdb) - vehicleNFT := test.SetupCreateVehicleNFT(s.T(), ud, vin, vehicleTokenID, null.Bytes{}, s.pdb) + vehicleNFT := test.SetupCreateVehicleNFT(s.T(), ud, vehicleTokenID, null.Bytes{}, s.pdb) integration := test.BuildIntegrationGRPC(constants.AutoPiVendor, 10, 0) dd := test.BuildDeviceDefinitionGRPC(deviceDefinitionID, "Ford", "F150", 2020, integration) @@ -337,7 +337,7 @@ func (s *IntegrationTestSuite) Test_Pair_With_UserDeviceStyle_HardwareTemplate_S _, apAddr, _ := test.GenerateWallet() ud := test.SetupCreateUserDevice(s.T(), testUserID, deviceDefinitionID, nil, "", s.pdb) autoPIUnit := test.SetupCreateMintedAftermarketDevice(s.T(), testUserID, unitID, autoPiTokenID, *apAddr, &ud.ID, s.pdb) - vehicleNFT := test.SetupCreateVehicleNFT(s.T(), ud, vin, vehicleTokenID, null.Bytes{}, s.pdb) + vehicleNFT := test.SetupCreateVehicleNFT(s.T(), ud, vehicleTokenID, null.Bytes{}, s.pdb) integration := test.BuildIntegrationGRPC(constants.AutoPiVendor, 10, 0) dd := test.BuildDeviceDefinitionGRPC(deviceDefinitionID, "Ford", "F150", 2020, integration) diff --git a/internal/test/helpers.go b/internal/test/helpers.go index 620eab276..54cdcbaf3 100644 --- a/internal/test/helpers.go +++ b/internal/test/helpers.go @@ -291,7 +291,7 @@ func SetupCreateMintedAftermarketDevice(t *testing.T, userID, unitID string, tok return &amd } -func SetupCreateVehicleNFT(t *testing.T, userDevice models.UserDevice, vin string, tokenID *big.Int, ownerAddr null.Bytes, pdb db.Store) *models.UserDevice { +func SetupCreateVehicleNFT(t *testing.T, userDevice models.UserDevice, tokenID *big.Int, ownerAddr null.Bytes, pdb db.Store) *models.UserDevice { mint := models.MetaTransactionRequest{ ID: ksuid.New().String(), @@ -309,7 +309,7 @@ func SetupCreateVehicleNFT(t *testing.T, userDevice models.UserDevice, vin strin return &userDevice } -func SetupCreateVehicleNFTForMiddleware(t *testing.T, addr common.Address, userID, userDeviceID string, tokenID int64, pdb db.Store) *models.UserDevice { +func SetupCreateVehicleNFTForMiddleware(t *testing.T, addr common.Address, userID, userDeviceID string, pdb db.Store) *models.UserDevice { mint := models.MetaTransactionRequest{ ID: ksuid.New().String(), }