eliminate the random module's dependency on oracle

irisnet · Jun 25, 2024 · c2cda47 · c2cda47
1 parent cbfc764
commit c2cda47
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
diff --git a/modules/random/go.mod b/modules/random/go.mod
@@ -21,7 +21,6 @@ require (
 	google.golang.org/grpc v1.60.1
 	google.golang.org/protobuf v1.32.0
 	mods.irisnet.org/api v1.0.0-beta
-	mods.irisnet.org/modules/oracle v1.0.0-beta
 	mods.irisnet.org/modules/service v1.0.0-beta
 	mods.irisnet.org/simapp v1.0.0-beta
 )
@@ -201,7 +200,6 @@ replace (
 
 	// TODO
 	mods.irisnet.org/api => ../../api
-	mods.irisnet.org/modules/oracle => ../oracle
 	mods.irisnet.org/modules/service => ../service
 	mods.irisnet.org/simapp => ../../simapp
 )
diff --git a/modules/random/keeper/service.go b/modules/random/keeper/service.go
@@ -132,7 +132,7 @@ func (k Keeper) HandlerResponse(
 	}
 
 	outputBody := gjson.Get(responseOutput[0], servicetypes.PATH_BODY).String()
-	if err := servicetypes.ValidateResponseOutputBody(types.ServiceSchemas, outputBody); err != nil {
+	if err := servicetypes.ValidateResponseOutputBody(servicetypes.RandomServiceSchemas, outputBody); err != nil {
 		ctx.Logger().Error(
 			"invalid output body",
 			"body", outputBody,
@@ -141,7 +141,7 @@ func (k Keeper) HandlerResponse(
 		return
 	}
 
-	seedStr := gjson.Get(outputBody, types.ServiceValueJSONPath).String()
+	seedStr := gjson.Get(outputBody, servicetypes.RandomServiceValueJSONPath).String()
 	seed, err := hex.DecodeString(seedStr)
 	if err != nil || len(seed) != types.SeedBytesLength {
 		ctx.Logger().Error(

diff --git a/modules/random/types/keys.go b/modules/random/types/keys.go
@@ -16,6 +16,9 @@ const (
 
 	// RouterKey is the msg router key for the random module
 	RouterKey = ModuleName
+
+	// ServiceName is the name of the random service
+	ServiceName          = ModuleName
 )
 
 var (

diff --git a/modules/random/types/service.go → modules/service/types/random.go b/modules/random/types/service.go → modules/service/types/random.go
@@ -4,17 +4,14 @@ import (
 	"github.com/cometbft/cometbft/crypto"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	"mods.irisnet.org/modules/oracle/types"
-	servicetypes "mods.irisnet.org/modules/service/types"
 )
 
 const (
-	ServiceName          = "random"
-	ServiceDesc          = "system service definition of random module"
-	ServiceValueJSONPath = "seed"
-	AuthorDescription    = "random module account"
-	ServiceSchemas       = `
+	RandomServiceName          = "random"
+	RandomServiceDesc          = "system service definition of random module"
+	RandomServiceValueJSONPath = "seed"
+	RandomAuthorDescription    = "random module account"
+	RandomServiceSchemas       = `
 	{
 		"input": {
 			"$schema": "http://json-schema.org/draft-04/schema#",
@@ -44,17 +41,17 @@ const (
 )
 
 var (
-	ServiceTags = []string{types.ModuleName}
-	Author      = sdk.AccAddress(crypto.AddressHash([]byte(types.ModuleName)))
+	RandomServiceTags = []string{"oracle"}
+	RandomAuthor      = sdk.AccAddress(crypto.AddressHash([]byte("oracle")))
 )
 
-func GetSvcDefinition() servicetypes.ServiceDefinition {
-	return servicetypes.NewServiceDefinition(
-		ServiceName,
-		ServiceDesc,
-		ServiceTags,
-		Author,
-		AuthorDescription,
-		ServiceSchemas,
+func GetRandomSvcDefinition() ServiceDefinition {
+	return NewServiceDefinition(
+		RandomServiceName,
+		RandomServiceDesc,
+		RandomServiceTags,
+		RandomAuthor,
+		RandomAuthorDescription,
+		RandomServiceSchemas,
 	)
-}
+}