diff --git a/internal/svc/svc.go b/internal/svc/svc.go index 312c823..d0e134d 100644 --- a/internal/svc/svc.go +++ b/internal/svc/svc.go @@ -9,8 +9,8 @@ import ( "github.com/b2network/b2committer/pkg/beacon" "github.com/b2network/b2committer/pkg/client" "github.com/b2network/b2committer/pkg/contract/op" - "github.com/b2network/b2committer/pkg/ds" "github.com/b2network/b2committer/pkg/log" + "github.com/b2network/b2committer/pkg/store" "github.com/b2network/b2committer/pkg/unisat" "github.com/ethereum-optimism/optimism/op-service/sources" "github.com/ethereum/go-ethereum/common" @@ -38,7 +38,7 @@ type ServiceContext struct { SyncedBlobBlockNumber int64 SyncedBlobBlockHash common.Hash OpCommitterClient *b2node.OpCommitterClient - DecentralizedStore ds.DecentralizedStore + DecentralizedStore store.DecentralizedStore UnisatHTTPClient *unisat.UstHTTPClient } @@ -121,7 +121,7 @@ func NewServiceContext(cfg *types.Config, bitcoinCfg *types.BitcoinRPCConfig, b2 log.Panicf("[svc] init arweave wallet panic: %s\n", err) } - svc.DecentralizedStore = ds.NewArWeave(w, arClient) + svc.DecentralizedStore = store.NewArWeave(w, arClient) } return svc diff --git a/pkg/ds/ds.go b/pkg/store/arweave.go similarity index 84% rename from pkg/ds/ds.go rename to pkg/store/arweave.go index 763e0e1..b26c0ed 100644 --- a/pkg/ds/ds.go +++ b/pkg/store/arweave.go @@ -1,4 +1,4 @@ -package ds +package store import ( "strconv" @@ -7,10 +7,6 @@ import ( "github.com/everFinance/goar/types" ) -type DecentralizedStore interface { - StoreDetailsOnChain(txs []byte, chainID int64, proposalID uint64) (string, error) - QueryDetailsByTxID(txID string) ([]byte, error) -} type ArWeave struct { Client *goar.Client Wallet *goar.Wallet diff --git a/pkg/ds/ds_test.go b/pkg/store/arweave_test.go similarity index 98% rename from pkg/ds/ds_test.go rename to pkg/store/arweave_test.go index 01e0353..5af8ad4 100644 --- a/pkg/ds/ds_test.go +++ b/pkg/store/arweave_test.go @@ -1,4 +1,4 @@ -package ds +package store import ( "fmt" diff --git a/pkg/store/store.go b/pkg/store/store.go new file mode 100644 index 0000000..d7f119f --- /dev/null +++ b/pkg/store/store.go @@ -0,0 +1,6 @@ +package store + +type DecentralizedStore interface { + StoreDetailsOnChain(txs []byte, chainID int64, proposalID uint64) (string, error) + QueryDetailsByTxID(txID string) ([]byte, error) +}