From cb07beb7111f34e5752645ec248100ec2b807810 Mon Sep 17 00:00:00 2001 From: soonkuk Date: Tue, 7 Feb 2023 18:24:54 +0900 Subject: [PATCH 1/7] feat: use base58 to make string from hash --- .gitignore | 3 ++ .golangci.yml | 2 +- base/address.go | 4 +-- base/ballot.go | 2 +- base/ballot_isvalid.go | 2 +- base/base_fact.go | 6 ++-- base/base_node.go | 6 ++-- base/base_node_test.go | 6 ++-- base/base_operation.go | 6 ++-- base/base_operation_json.go | 8 ++--- base/base_operation_test.go | 10 +++--- base/base_state.go | 8 ++--- base/base_state_test.go | 10 +++--- base/base_string_address.go | 4 +-- base/block.go | 4 +-- base/block_log.go | 2 +- base/fact.go | 2 +- base/init.go | 2 +- base/network_id.go | 9 +++-- base/node.go | 2 +- base/operation.go | 23 +++++------- base/pk.go | 17 ++++----- base/pk_priv.go | 34 ++++++++---------- base/pk_priv_test.go | 8 ++--- base/pk_pub.go | 29 ++++++--------- base/pk_pub_test.go | 4 +-- base/pk_test.go | 4 +-- base/point.go | 2 +- base/point_json.go | 2 +- base/point_test.go | 4 +-- base/policy.go | 4 +-- base/proposal.go | 2 +- base/sign.go | 4 +-- base/sign_json.go | 6 ++-- base/sign_test.go | 8 ++--- base/stage.go | 2 +- base/state.go | 4 +-- base/string_address.go | 4 +-- base/string_address_test.go | 8 ++--- base/suffrage.go | 4 +-- base/test_address.go | 2 +- base/test_ballot.go | 2 +- base/test_block.go | 12 +++---- base/test_fact.go | 6 ++-- base/test_network_id.go | 2 +- base/test_node.go | 2 +- base/test_policy.go | 2 +- base/test_proposal.go | 4 +-- base/test_sign.go | 2 +- base/test_state.go | 4 +-- base/test_suffrage.go | 8 ++--- base/test_voteproof.go | 4 +-- base/threshold.go | 2 +- base/voteproof.go | 2 +- base/voteproof_isvalid.go | 2 +- example/.gitignore | 2 -- example/main.go | 10 +++--- go.mod | 3 +- go.sum | 19 ++++++++++ isaac/ballot.go | 6 ++-- isaac/ballot_fact.go | 8 ++--- isaac/ballot_fact_json.go | 8 ++--- isaac/ballot_fact_test.go | 10 +++--- isaac/ballot_json.go | 8 ++--- isaac/ballot_sign.go | 6 ++-- isaac/ballot_sign_json.go | 8 ++--- isaac/ballot_sign_test.go | 10 +++--- isaac/ballot_test.go | 10 +++--- isaac/block.go | 12 +++---- isaac/block/import_block.go | 6 ++-- isaac/block/import_block_test.go | 12 +++---- isaac/block/importer.go | 10 +++--- isaac/block/importer_test.go | 10 +++--- isaac/block/localfs_importer.go | 10 +++--- isaac/block/localfs_writer.go | 14 ++++---- isaac/block/localfs_writer_test.go | 12 +++---- isaac/block/map.go | 6 ++-- isaac/block/map_json.go | 8 ++--- isaac/block/map_test.go | 12 +++---- isaac/block/reader.go | 10 +++--- isaac/block/reader_test.go | 10 +++--- isaac/block/readers_test.go | 12 +++---- isaac/block/states_merger.go | 4 +-- isaac/block/states_merger_test.go | 8 ++--- isaac/block/suffrage.go | 10 +++--- isaac/block/suffrage_json.go | 10 +++--- isaac/block/suffrage_test.go | 18 +++++----- isaac/block/test_importer.go | 14 ++++---- isaac/block/validator.go | 12 +++---- isaac/block/validator_test.go | 10 +++--- isaac/block/writer.go | 10 +++--- isaac/block/writer_test.go | 10 +++--- isaac/block_json.go | 12 +++---- isaac/block_test.go | 10 +++--- isaac/block_writer.go | 6 ++-- isaac/database.go | 6 ++-- isaac/database/block_write.go | 12 +++---- isaac/database/block_write_test.go | 10 +++--- isaac/database/center.go | 14 ++++---- isaac/database/center_test.go | 14 ++++---- isaac/database/frame.go | 12 +++---- isaac/database/leveldb.go | 14 ++++---- isaac/database/perm_base.go | 4 +-- isaac/database/perm_leveldb.go | 14 ++++---- isaac/database/perm_leveldb_test.go | 8 ++--- isaac/database/perm_redis.go | 16 ++++----- isaac/database/perm_redis_test.go | 8 ++--- isaac/database/perm_test.go | 8 ++--- isaac/database/pool.go | 14 ++++---- isaac/database/pool_test.go | 12 +++---- isaac/database/temp_leveldb.go | 12 +++---- isaac/database/temp_leveldb_test.go | 8 ++--- isaac/database/temp_sync_leveldb.go | 8 ++--- isaac/database/temp_sync_mem.go | 4 +-- isaac/database/test_database.go | 18 +++++----- isaac/last_consensus_nodes_watcher.go | 6 ++-- isaac/last_voteproofs.go | 4 +-- isaac/last_voteproofs_test.go | 4 +-- isaac/lastpoint.go | 2 +- isaac/lastpoint_test.go | 2 +- isaac/network.go | 8 ++--- isaac/network/client.go | 32 +++++++++++++---- isaac/network/conn.go | 14 ++++---- isaac/network/conn_test.go | 12 +++---- isaac/network/header.go | 10 +++--- isaac/network/header_json.go | 12 +++---- isaac/network/header_json_test.go | 12 +++---- isaac/network/node_info.go | 12 +++---- isaac/network/node_info_json.go | 14 ++++---- isaac/network/node_info_test.go | 16 ++++----- isaac/network/quicstream_handlers.go | 14 ++++---- isaac/network/quicstream_handlers_handover.go | 10 +++--- .../quicstream_handlers_handover_test.go | 10 +++--- isaac/network/quicstream_handlers_test.go | 18 +++++----- isaac/network/sync.go | 16 ++++----- isaac/network/sync_test.go | 14 ++++---- isaac/network/sync_yaml.go | 12 +++---- isaac/network/tests.go | 6 ++-- isaac/network_policy.go | 6 ++-- isaac/network_policy_json.go | 8 ++--- isaac/network_policy_test.go | 10 +++--- isaac/node.go | 4 +-- isaac/node_test.go | 6 ++-- isaac/operation.go | 4 +-- isaac/operation/policy_network.go | 12 +++---- isaac/operation/policy_network_json.go | 6 ++-- isaac/operation/policy_network_processor.go | 6 ++-- .../policy_network_processor_test.go | 8 ++--- isaac/operation/policy_network_test.go | 10 +++--- isaac/operation/suffrage_candidate.go | 8 ++--- isaac/operation/suffrage_candidate_json.go | 6 ++-- .../operation/suffrage_candidate_processor.go | 6 ++-- .../suffrage_candidate_processor_test.go | 8 ++--- isaac/operation/suffrage_candidate_test.go | 8 ++--- isaac/operation/suffrage_disjoin.go | 8 ++--- isaac/operation/suffrage_disjoin_json.go | 6 ++-- isaac/operation/suffrage_disjoin_processor.go | 6 ++-- .../suffrage_disjoin_processor_test.go | 8 ++--- isaac/operation/suffrage_disjoin_test.go | 10 +++--- isaac/operation/suffrage_expel_processor.go | 6 ++-- .../suffrage_expel_processor_test.go | 8 ++--- isaac/operation/suffrage_join.go | 10 +++--- isaac/operation/suffrage_join_json.go | 6 ++-- isaac/operation/suffrage_join_processor.go | 6 ++-- .../operation/suffrage_join_processor_test.go | 8 ++--- isaac/operation/suffrage_join_test.go | 12 +++---- isaac/params.go | 6 ++-- isaac/params_test.go | 8 ++--- isaac/proposal.go | 10 +++--- isaac/proposal_fact_test.go | 10 +++--- isaac/proposal_json.go | 12 +++---- isaac/proposal_maker.go | 6 ++-- isaac/proposal_maker_test.go | 6 ++-- isaac/proposal_processor.go | 16 ++++----- isaac/proposal_processor_test.go | 14 ++++---- isaac/proposal_processors.go | 6 ++-- isaac/proposal_processors_test.go | 8 ++--- isaac/proposal_selector.go | 6 ++-- isaac/proposal_selector_test.go | 18 ++++------ isaac/proposal_sign_test.go | 10 +++--- isaac/proposer_selector.go | 4 +-- isaac/readers.go | 12 +++---- isaac/states/ballot.go | 6 ++-- isaac/states/ballot_stuck_resolver.go | 14 ++++---- isaac/states/ballot_stuck_resolver_test.go | 6 ++-- isaac/states/ballotbox.go | 8 ++--- isaac/states/ballotbox_test.go | 10 +++--- isaac/states/base.go | 8 ++--- isaac/states/base_ballot_handler.go | 8 ++--- isaac/states/booting.go | 8 ++--- isaac/states/booting_test.go | 6 ++-- isaac/states/broadcast.go | 6 ++-- isaac/states/broadcast_test.go | 8 ++--- isaac/states/broken.go | 4 +-- isaac/states/consensus.go | 6 ++-- .../consensus_new_accept_voteproof_test.go | 10 +++--- .../consensus_new_expel_voteproof_test.go | 10 +++--- .../consensus_new_init_voteproof_test.go | 10 +++--- isaac/states/consensus_test.go | 12 +++---- isaac/states/handler.go | 4 +-- isaac/states/handover.go | 6 ++-- isaac/states/handover_message.go | 6 ++-- isaac/states/handover_message_json.go | 8 ++--- isaac/states/handover_message_json_test.go | 14 ++++---- isaac/states/handover_test.go | 12 +++---- isaac/states/handover_x.go | 8 ++--- isaac/states/handover_x_test.go | 8 ++--- isaac/states/handover_xy_test.go | 10 +++--- isaac/states/handover_y.go | 8 ++--- isaac/states/handover_y_test.go | 10 +++--- isaac/states/joining.go | 8 ++--- isaac/states/joining_test.go | 10 +++--- .../last_consensus_nodes_watcher_test.go | 8 ++--- isaac/states/states.go | 10 +++--- isaac/states/states_handover.go | 8 ++--- isaac/states/states_handover_test.go | 10 +++--- isaac/states/states_test.go | 10 +++--- isaac/states/stopped.go | 2 +- isaac/states/suffrage_builder_test.go | 14 ++++---- isaac/states/syncer.go | 10 +++--- isaac/states/syncer_test.go | 14 ++++---- isaac/states/syncing.go | 10 +++--- isaac/states/syncing_test.go | 10 +++--- isaac/states/test_ballot.go | 6 ++-- isaac/states/tests.go | 8 ++--- isaac/states/voteproof_handler.go | 8 ++--- isaac/suffrage.go | 4 +-- isaac/suffrage_builder.go | 4 +-- isaac/suffrage_json.go | 8 ++--- isaac/suffrage_limiter.go | 6 ++-- isaac/suffrage_limiter_json.go | 4 +-- isaac/suffrage_limiter_test.go | 8 ++--- isaac/suffrage_operation.go | 8 ++--- isaac/suffrage_operation_json.go | 6 ++-- isaac/suffrage_operation_test.go | 10 +++--- isaac/suffrage_state.go | 8 ++--- isaac/suffrage_state_test.go | 8 ++--- isaac/suffrage_voting.go | 4 +-- isaac/suffrage_voting_test.go | 4 +-- isaac/syncer.go | 6 ++-- isaac/syncer_test.go | 10 +++--- isaac/test_ballot.go | 6 ++-- isaac/test_operation.go | 10 +++--- isaac/test_proposal.go | 4 +-- isaac/test_readers.go | 4 +-- isaac/test_suffrage.go | 2 +- isaac/test_voteproof.go | 4 +-- isaac/voteproof.go | 8 ++--- isaac/voteproof_isvalid.go | 4 +-- isaac/voteproof_json.go | 12 +++---- isaac/voteproof_test.go | 10 +++--- launch/acl.go | 12 +++---- launch/acl_test.go | 8 ++--- launch/block.go | 10 +++--- launch/cmd/base.go | 10 +++--- launch/cmd/clean.go | 8 ++--- launch/cmd/database_extract.go | 18 +++++----- launch/cmd/dev_blocks.go | 16 ++++----- launch/cmd/handover.go | 6 ++-- launch/cmd/import.go | 18 +++++----- launch/cmd/init.go | 6 ++-- launch/cmd/key.go | 8 ++--- launch/cmd/network.go | 12 +++---- launch/cmd/network_block_item_file.go | 12 +++---- launch/cmd/network_client_event.go | 6 ++-- launch/cmd/network_client_node_info.go | 6 ++-- launch/cmd/network_client_rw_node.go | 6 ++-- launch/cmd/network_last_blockmap.go | 11 ++---- launch/cmd/network_send_operation.go | 6 ++-- launch/cmd/network_state.go | 11 ++---- launch/cmd/run.go | 16 ++++----- launch/cmd/storage_status.go | 14 ++++---- launch/cmd/validate_blocks.go | 16 ++++----- launch/design.go | 14 ++++---- launch/design_test.go | 18 +++++----- launch/event.go | 26 +++++++------- launch/event_test.go | 4 +-- launch/flags.go | 10 +++--- launch/genesis.go | 14 ++++---- launch/handover.go | 20 +++++------ launch/hinters.go | 22 ++++++------ launch/info.go | 10 +++--- launch/local_params.go | 12 +++---- launch/local_params_marshal.go | 10 +++--- launch/logging.go | 4 +-- launch/p_acl.go | 10 +++--- launch/p_design.go | 11 +++--- launch/p_discovery.go | 6 ++-- launch/p_encoder.go | 8 ++--- launch/p_genesis.go | 12 +++---- launch/p_local.go | 10 +++--- launch/p_memberlist.go | 26 +++++++------- launch/p_memberlist_test.go | 2 +- launch/p_network.go | 14 ++++---- launch/p_network_handlers.go | 35 ++++++++++--------- launch/p_node_rw.go | 24 ++++++------- launch/p_nodeinfo.go | 16 ++++----- launch/p_proposal.go | 20 +++++------ launch/p_proposal_maker.go | 19 +++++----- launch/p_ratelimit.go | 12 +++---- launch/p_readers.go | 12 +++---- launch/p_states.go | 28 +++++++-------- launch/p_states_network_handlers.go | 24 ++++++------- launch/p_storage.go | 20 +++++------ launch/p_suffrage.go | 20 +++++------ launch/p_sync.go | 14 ++++---- launch/p_time_sync.go | 8 ++--- launch/ps_import.go | 2 +- launch/ps_init.go | 2 +- launch/ps_main.go | 6 ++-- launch/ps_run.go | 2 +- launch/ratelimit.go | 10 +++--- launch/ratelimit_json.go | 2 +- launch/ratelimit_json_test.go | 8 ++--- launch/ratelimit_test.go | 10 +++--- launch/suffrage.go | 4 +-- network/conn.go | 2 +- network/quicmemberlist/broadcast.go | 12 +++---- network/quicmemberlist/conn.go | 6 ++-- network/quicmemberlist/conn_test.go | 2 +- network/quicmemberlist/delegate.go | 8 ++--- network/quicmemberlist/member.go | 14 ++++---- network/quicmemberlist/memberlist.go | 16 ++++----- network/quicmemberlist/memberlist_test.go | 13 ++++--- network/quicmemberlist/transport.go | 6 ++-- network/quicstream/client.go | 2 +- network/quicstream/client_test.go | 2 +- network/quicstream/conn.go | 4 +-- network/quicstream/conn_test.go | 6 ++-- network/quicstream/connection.go | 2 +- network/quicstream/connection_test.go | 2 +- network/quicstream/handler.go | 6 ++-- network/quicstream/header/broker.go | 6 ++-- network/quicstream/header/broker_test.go | 12 +++---- network/quicstream/header/handler.go | 6 ++-- network/quicstream/header/header.go | 6 ++-- network/quicstream/header/header_json.go | 4 +-- network/quicstream/header/header_json_test.go | 8 ++--- network/quicstream/server.go | 4 +-- network/quicstream/tests.go | 2 +- storage/errors.go | 2 +- storage/leveldb/db.go | 4 +-- storage/leveldb/db_test.go | 2 +- storage/leveldb/prefix.go | 4 +-- storage/leveldb/prefix_test.go | 4 +-- storage/redis/db.go | 4 +-- storage/redis/db_test.go | 5 ++- util/checksum.go | 4 +-- util/encoder/encoder.go | 5 +-- util/encoder/encoders.go | 2 +- util/encoder/json/encoder.go | 30 ++++++++++++++-- util/encoder/json/encoder_test.go | 6 ++-- util/encoder/json/util.go | 2 +- util/encoder/tests.go | 2 +- util/encoder/util.go | 4 +-- util/fixedtree/node.go | 11 ++---- util/fixedtree/node_test.go | 8 ++--- util/fixedtree/proof.go | 4 +-- util/fixedtree/proof_json.go | 2 +- util/fixedtree/proof_test.go | 8 ++--- util/fixedtree/tree.go | 6 ++-- util/fixedtree/tree_test.go | 6 ++-- util/fixedtree/writer.go | 4 +-- util/fixedtree/writer_test.go | 2 +- util/hash.go | 10 +++--- util/hint/hint.go | 2 +- util/hint/hint_test.go | 2 +- util/hint/hinter.go | 2 +- util/hint/hinter_test.go | 2 +- util/hint/set.go | 2 +- util/hint/set_test.go | 2 +- util/hint/type.go | 2 +- util/localtime/time.go | 2 +- util/localtime/time_sync.go | 4 +-- util/localtime/time_test.go | 2 +- util/ps/ps.go | 4 +-- util/ps/ps_test.go | 2 +- util/valuehash/blake3_test.go | 2 +- util/valuehash/bytes.go | 20 +++-------- util/valuehash/bytes_test.go | 2 +- util/valuehash/keccak_test.go | 2 +- util/valuehash/static.go | 2 +- util/valuehash/static_test.go | 2 +- util/valuehash/util.go | 2 +- 384 files changed, 1625 insertions(+), 1617 deletions(-) delete mode 100644 example/.gitignore diff --git a/.gitignore b/.gitignore index 3f5b6073..f0be7737 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ tests/*/*/coverage/ /*.log .*.yaml /.release-it.json +example/yml +example/*.sh +example/*.yml diff --git a/.golangci.yml b/.golangci.yml index 4b0eda43..02e8b288 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1394,7 +1394,7 @@ linters-settings: ignorePackageGlobs: - encoding/* - github.com/pkg/* - - github.com/spikeekips/mitum/* + - github.com/socialinfratech/mitum2/* ignoreInterfaceRegexps: - ^(?i)c(?-i)ach(ing|e) diff --git a/base/address.go b/base/address.go index 2d768fa1..8564dcf1 100644 --- a/base/address.go +++ b/base/address.go @@ -3,9 +3,9 @@ package base import ( "fmt" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" ) const AddressTypeSize = 3 diff --git a/base/ballot.go b/base/ballot.go index 266d5aa3..6a0c25a0 100644 --- a/base/ballot.go +++ b/base/ballot.go @@ -1,7 +1,7 @@ package base import ( - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) type BallotFact interface { diff --git a/base/ballot_isvalid.go b/base/ballot_isvalid.go index 7ba05eec..8ea0b351 100644 --- a/base/ballot_isvalid.go +++ b/base/ballot_isvalid.go @@ -1,7 +1,7 @@ package base import ( - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) func IsValidBallot(bl Ballot, networkID []byte) error { diff --git a/base/base_fact.go b/base/base_fact.go index fb8f06c3..ae7949cb 100644 --- a/base/base_fact.go +++ b/base/base_fact.go @@ -1,9 +1,9 @@ package base import ( - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" ) type BaseFact struct { diff --git a/base/base_node.go b/base/base_node.go index 6270f307..9e8e3d1e 100644 --- a/base/base_node.go +++ b/base/base_node.go @@ -1,10 +1,10 @@ package base import ( + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" ) type BaseNode struct { diff --git a/base/base_node_test.go b/base/base_node_test.go index c25cb4ed..4f1c4de8 100644 --- a/base/base_node_test.go +++ b/base/base_node_test.go @@ -3,9 +3,9 @@ package base import ( "testing" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/stretchr/testify/suite" ) diff --git a/base/base_operation.go b/base/base_operation.go index 4fc13552..cd9e6d1a 100644 --- a/base/base_operation.go +++ b/base/base_operation.go @@ -3,10 +3,10 @@ package base import ( "context" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" "golang.org/x/exp/slices" ) diff --git a/base/base_operation_json.go b/base/base_operation_json.go index 06d3c34e..3f9bce4c 100644 --- a/base/base_operation_json.go +++ b/base/base_operation_json.go @@ -3,11 +3,11 @@ package base import ( "encoding/json" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" ) type BaseOperationJSONMarshaler struct { diff --git a/base/base_operation_test.go b/base/base_operation_test.go index 70bc8f3b..cfe205fe 100644 --- a/base/base_operation_test.go +++ b/base/base_operation_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/base/base_state.go b/base/base_state.go index 3bb58ab6..533d74aa 100644 --- a/base/base_state.go +++ b/base/base_state.go @@ -6,10 +6,10 @@ import ( "strings" "sync" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "golang.org/x/exp/slices" ) diff --git a/base/base_state_test.go b/base/base_state_test.go index 5e331265..823d43f0 100644 --- a/base/base_state_test.go +++ b/base/base_state_test.go @@ -6,12 +6,12 @@ import ( "sync" "testing" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/base/base_string_address.go b/base/base_string_address.go index bb4f0414..e2bf42aa 100644 --- a/base/base_string_address.go +++ b/base/base_string_address.go @@ -3,8 +3,8 @@ package base import ( "regexp" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) var ( diff --git a/base/block.go b/base/block.go index baa0f2fa..08314979 100644 --- a/base/block.go +++ b/base/block.go @@ -6,9 +6,9 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/fixedtree" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/fixedtree" ) type Manifest interface { diff --git a/base/block_log.go b/base/block_log.go index 8c3da17a..07c00ee2 100644 --- a/base/block_log.go +++ b/base/block_log.go @@ -1,8 +1,8 @@ package base import ( + "github.com/ProtoconNet/mitum2/util/hint" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util/hint" ) func ManifestLog(m Manifest) *zerolog.Event { diff --git a/base/fact.go b/base/fact.go index 036e7d3a..09d58ed2 100644 --- a/base/fact.go +++ b/base/fact.go @@ -3,7 +3,7 @@ package base import ( "math" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) const MaxTokenSize = math.MaxUint16 diff --git a/base/init.go b/base/init.go index e83c71c1..54730360 100644 --- a/base/init.go +++ b/base/init.go @@ -1,6 +1,6 @@ package base -import "github.com/spikeekips/mitum/util" +import "github.com/ProtoconNet/mitum2/util" var objcache util.GCache[string, any] diff --git a/base/network_id.go b/base/network_id.go index 8bb8d899..a94d43e8 100644 --- a/base/network_id.go +++ b/base/network_id.go @@ -2,10 +2,9 @@ package base import ( "bytes" - "encoding/hex" - + "encoding/base64" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" ) // NetworkID will be used to separate mitum network with the other mitum @@ -38,11 +37,11 @@ func (ni NetworkID) Equal(a NetworkID) bool { } func (ni NetworkID) MarshalText() ([]byte, error) { - return []byte(hex.EncodeToString(ni.Bytes())), nil + return []byte(base64.StdEncoding.EncodeToString(ni.Bytes())), nil } func (ni *NetworkID) UnmarshalText(b []byte) error { - s, err := hex.DecodeString(string(b)) + s, err := base64.StdEncoding.DecodeString(string(b)) if err != nil { return errors.Wrap(err, "unmarshal NetworkID") } diff --git a/base/node.go b/base/node.go index 5986ee78..f6accea3 100644 --- a/base/node.go +++ b/base/node.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) type Node interface { diff --git a/base/operation.go b/base/operation.go index 3ca6ea55..985ec78e 100644 --- a/base/operation.go +++ b/base/operation.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" ) var ( @@ -73,13 +73,13 @@ func NewNotInStateOperationFixedtreeNode(facthash util.Hash, reason string) Oper } func (no OperationFixedtreeNode) InState() bool { - _, instate, _ := ParseTreeNodeOperationKey(no.Key()) + _, instate := ParseTreeNodeOperationKey(no.Key()) return instate } func (no OperationFixedtreeNode) Operation() util.Hash { - h, _, _ := ParseTreeNodeOperationKey(no.Key()) + h, _ := ParseTreeNodeOperationKey(no.Key()) return h } @@ -203,7 +203,7 @@ func (e *BaseOperationProcessReasonError) UnmarshalJSON(b []byte) error { return nil } -func ParseTreeNodeOperationKey(s string) (util.Hash, bool, error) { +func ParseTreeNodeOperationKey(s string) (util.Hash, bool) { k := s var notInState bool @@ -213,12 +213,7 @@ func ParseTreeNodeOperationKey(s string) (util.Hash, bool, error) { notInState = true } - switch i, err := valuehash.NewBytesFromString(k); { - case err != nil: - return nil, false, err - default: - return i, !notInState, nil - } + return valuehash.NewBytesFromString(k), !notInState } type BaseOperationProcessor struct { diff --git a/base/pk.go b/base/pk.go index 1f9fe72a..b3e524e8 100644 --- a/base/pk.go +++ b/base/pk.go @@ -2,12 +2,12 @@ package base import ( "bytes" - "encoding/hex" "fmt" + "github.com/btcsuite/btcutil/base58" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" ) const PKKeyTypeSize = 3 @@ -39,7 +39,7 @@ func (sg Signature) Bytes() []byte { } func (sg Signature) String() string { - return hex.EncodeToString(sg) + return base58.Encode(sg) } func (sg Signature) IsValid([]byte) error { @@ -63,14 +63,9 @@ func (sg Signature) MarshalText() ([]byte, error) { } func (sg *Signature) UnmarshalText(b []byte) error { - switch i, err := hex.DecodeString(string(b)); { - case err != nil: - return err - default: - *sg = Signature(i) + *sg = Signature(base58.Decode(string(b))) - return nil - } + return nil } func decodePKKeyFromString(s string, enc encoder.Encoder) (PKKey, error) { diff --git a/base/pk_priv.go b/base/pk_priv.go index 58be7a89..930e28fd 100644 --- a/base/pk_priv.go +++ b/base/pk_priv.go @@ -1,15 +1,17 @@ package base import ( - "encoding/hex" + "fmt" "strings" + "github.com/btcsuite/btcutil/base58" + + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" btcec "github.com/btcsuite/btcd/btcec/v2" btcec_ecdsa "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" ) var ( @@ -56,16 +58,15 @@ func ParseMPrivatekey(s string) (*MPrivatekey, error) { } func LoadMPrivatekey(s string) (*MPrivatekey, error) { - switch b, err := hex.DecodeString(s); { - case err != nil: - return nil, util.ErrInvalid.WithMessage(err, "private key") - case len(b) < 1: - return nil, util.ErrInvalid.Errorf("empty private key") - default: - priv, _ := btcec.PrivKeyFromBytes(b) - - return newMPrivatekeyFromPrivateKey(priv), nil + b := base58.Decode(s) + + if len(b) < 1 { + return nil, util.ErrInvalid.Errorf("malformed private key") } + + priv, _ := btcec.PrivKeyFromBytes(b) + + return newMPrivatekeyFromPrivateKey(priv), nil } func newMPrivatekeyFromPrivateKey(priv *btcec.PrivateKey) *MPrivatekey { @@ -76,12 +77,7 @@ func newMPrivatekeyFromPrivateKey(priv *btcec.PrivateKey) *MPrivatekey { } func (k *MPrivatekey) String() string { - var s strings.Builder - - _, _ = s.WriteString(hex.EncodeToString(k.priv.Serialize())) - _, _ = s.WriteString(k.Hint().Type().String()) - - return s.String() + return fmt.Sprintf("%s%s", base58.Encode(k.priv.Serialize()), k.Hint().Type().String()) } func (k *MPrivatekey) Bytes() []byte { diff --git a/base/pk_priv_test.go b/base/pk_priv_test.go index 10eb1ff6..7e14c49e 100644 --- a/base/pk_priv_test.go +++ b/base/pk_priv_test.go @@ -3,10 +3,10 @@ package base import ( "testing" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/stretchr/testify/suite" ) diff --git a/base/pk_pub.go b/base/pk_pub.go index 6a40c954..cde15fc7 100644 --- a/base/pk_pub.go +++ b/base/pk_pub.go @@ -1,15 +1,16 @@ package base import ( - "encoding/hex" + "fmt" "strings" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" btcec "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil/base58" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) // MPublickey is the default publickey of mitum, it is based on BTC Privatekey. @@ -39,26 +40,16 @@ func ParseMPublickey(s string) (*MPublickey, error) { } func LoadMPublickey(s string) (*MPublickey, error) { - switch i, err := hex.DecodeString(s); { - case err != nil: - return nil, err - default: - k, err := btcec.ParsePubKey(i) - if err != nil { - return nil, util.ErrInvalid.WithMessage(err, "load publickey") - } - - return NewMPublickey(k), nil + k, err := btcec.ParsePubKey(base58.Decode(s)) + if err != nil { + return nil, util.ErrInvalid.WithMessage(err, "load publickey") } + + return NewMPublickey(k), nil } func (k *MPublickey) String() string { - var s strings.Builder - - _, _ = s.WriteString(hex.EncodeToString(k.k.SerializeCompressed())) - _, _ = s.WriteString(k.Hint().Type().String()) - - return s.String() + return fmt.Sprintf("%s%s", base58.Encode(k.k.SerializeCompressed()), k.Hint().Type().String()) } func (k *MPublickey) Bytes() []byte { diff --git a/base/pk_pub_test.go b/base/pk_pub_test.go index 4f5804de..2c772339 100644 --- a/base/pk_pub_test.go +++ b/base/pk_pub_test.go @@ -3,8 +3,8 @@ package base import ( "testing" - "github.com/spikeekips/mitum/util" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/util" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" ) diff --git a/base/pk_test.go b/base/pk_test.go index 4ab7f288..afbc3f45 100644 --- a/base/pk_test.go +++ b/base/pk_test.go @@ -3,8 +3,8 @@ package base import ( "testing" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" ) diff --git a/base/point.go b/base/point.go index 4fc418c0..4774fefc 100644 --- a/base/point.go +++ b/base/point.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util" ) var ( diff --git a/base/point_json.go b/base/point_json.go index aa1e72d9..9fdcb956 100644 --- a/base/point_json.go +++ b/base/point_json.go @@ -1,6 +1,6 @@ package base -import "github.com/spikeekips/mitum/util" +import "github.com/ProtoconNet/mitum2/util" type HeightDecoder struct { h Height diff --git a/base/point_test.go b/base/point_test.go index cefefdc1..1dd1cf47 100644 --- a/base/point_test.go +++ b/base/point_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/stretchr/testify/suite" ) diff --git a/base/policy.go b/base/policy.go index 620c698b..a50fad37 100644 --- a/base/policy.go +++ b/base/policy.go @@ -1,8 +1,8 @@ package base import ( - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) type NetworkPolicy interface { diff --git a/base/proposal.go b/base/proposal.go index b13cd82c..b9d7e2e2 100644 --- a/base/proposal.go +++ b/base/proposal.go @@ -3,7 +3,7 @@ package base import ( "time" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) type ProposalFact interface { diff --git a/base/sign.go b/base/sign.go index 0f761db9..81882c9a 100644 --- a/base/sign.go +++ b/base/sign.go @@ -3,9 +3,9 @@ package base import ( "time" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/localtime" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/localtime" ) type Signer interface { diff --git a/base/sign_json.go b/base/sign_json.go index b990e42c..11ef79bd 100644 --- a/base/sign_json.go +++ b/base/sign_json.go @@ -1,9 +1,9 @@ package base import ( - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/localtime" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/localtime" ) type BaseSignJSONMarshaler struct { diff --git a/base/sign_test.go b/base/sign_test.go index d95c4e1d..77d69e59 100644 --- a/base/sign_test.go +++ b/base/sign_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/localtime" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/localtime" "github.com/stretchr/testify/suite" ) diff --git a/base/stage.go b/base/stage.go index 82a9f90a..3a4a23e0 100644 --- a/base/stage.go +++ b/base/stage.go @@ -1,7 +1,7 @@ package base import ( - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) type Stage string diff --git a/base/state.go b/base/state.go index de632eff..71f84abe 100644 --- a/base/state.go +++ b/base/state.go @@ -1,8 +1,8 @@ package base import ( - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) var StateFixedtreeHint = hint.MustNewHint("state-fixedtree-v0.0.1") diff --git a/base/string_address.go b/base/string_address.go index aa6d58c5..da7656f9 100644 --- a/base/string_address.go +++ b/base/string_address.go @@ -1,9 +1,9 @@ package base import ( + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) var StringAddressHint = hint.MustNewHint("sas-v2") diff --git a/base/string_address_test.go b/base/string_address_test.go index e1f4746a..00ea4c58 100644 --- a/base/string_address_test.go +++ b/base/string_address_test.go @@ -4,10 +4,10 @@ import ( "strings" "testing" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/stretchr/testify/suite" ) diff --git a/base/suffrage.go b/base/suffrage.go index 7e08dff7..36bd220d 100644 --- a/base/suffrage.go +++ b/base/suffrage.go @@ -1,9 +1,9 @@ package base import ( + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/fixedtree" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/fixedtree" ) type Suffrage interface { diff --git a/base/test_address.go b/base/test_address.go index 9b2d31e1..ef404bce 100644 --- a/base/test_address.go +++ b/base/test_address.go @@ -3,7 +3,7 @@ package base -import "github.com/spikeekips/mitum/util" +import "github.com/ProtoconNet/mitum2/util" func RandomAddress(prefix string) Address { return NewStringAddress(prefix + util.UUID().String()) diff --git a/base/test_ballot.go b/base/test_ballot.go index 688dd4b8..37c5aefa 100644 --- a/base/test_ballot.go +++ b/base/test_ballot.go @@ -4,8 +4,8 @@ package base import ( + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util/hint" "github.com/stretchr/testify/assert" ) diff --git a/base/test_block.go b/base/test_block.go index 0986e60f..036e0f31 100644 --- a/base/test_block.go +++ b/base/test_block.go @@ -7,13 +7,13 @@ import ( "encoding/json" "time" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/assert" ) diff --git a/base/test_fact.go b/base/test_fact.go index 94f79b44..bd8d4347 100644 --- a/base/test_fact.go +++ b/base/test_fact.go @@ -4,9 +4,9 @@ package base import ( - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/assert" ) diff --git a/base/test_network_id.go b/base/test_network_id.go index 1e31b84e..864cb1ac 100644 --- a/base/test_network_id.go +++ b/base/test_network_id.go @@ -3,7 +3,7 @@ package base -import "github.com/spikeekips/mitum/util" +import "github.com/ProtoconNet/mitum2/util" func RandomNetworkID() NetworkID { return NetworkID(util.UUID().Bytes()) diff --git a/base/test_node.go b/base/test_node.go index 6a64f384..bf121a2d 100644 --- a/base/test_node.go +++ b/base/test_node.go @@ -3,7 +3,7 @@ package base -import "github.com/spikeekips/mitum/util/hint" +import "github.com/ProtoconNet/mitum2/util/hint" var DummyNodeHint = hint.MustNewHint("dummy-node-v0.0.1") diff --git a/base/test_policy.go b/base/test_policy.go index 4f7a1ba3..8e21288e 100644 --- a/base/test_policy.go +++ b/base/test_policy.go @@ -4,8 +4,8 @@ package base import ( + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util/hint" "github.com/stretchr/testify/assert" ) diff --git a/base/test_proposal.go b/base/test_proposal.go index 52c9de43..57eaee63 100644 --- a/base/test_proposal.go +++ b/base/test_proposal.go @@ -4,9 +4,9 @@ package base import ( + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" "github.com/stretchr/testify/assert" ) diff --git a/base/test_sign.go b/base/test_sign.go index 88ff5554..3ed8d5bd 100644 --- a/base/test_sign.go +++ b/base/test_sign.go @@ -6,7 +6,7 @@ package base import ( "bytes" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/assert" ) diff --git a/base/test_state.go b/base/test_state.go index a910d754..c7a6ca47 100644 --- a/base/test_state.go +++ b/base/test_state.go @@ -4,8 +4,8 @@ package base import ( - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) func (s *BaseState) SetOperations(ops []util.Hash) BaseState { diff --git a/base/test_suffrage.go b/base/test_suffrage.go index 20e128c8..d1f6afcd 100644 --- a/base/test_suffrage.go +++ b/base/test_suffrage.go @@ -6,11 +6,11 @@ package base import ( "encoding/json" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/hint" "github.com/stretchr/testify/assert" ) diff --git a/base/test_voteproof.go b/base/test_voteproof.go index bf12c7ee..628af343 100644 --- a/base/test_voteproof.go +++ b/base/test_voteproof.go @@ -4,8 +4,8 @@ package base import ( - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" "github.com/stretchr/testify/assert" ) diff --git a/base/threshold.go b/base/threshold.go index 369942c2..9f2d0fbe 100644 --- a/base/threshold.go +++ b/base/threshold.go @@ -4,8 +4,8 @@ import ( "math" "strconv" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" ) var ( diff --git a/base/voteproof.go b/base/voteproof.go index 3dd90de2..ab28ae4a 100644 --- a/base/voteproof.go +++ b/base/voteproof.go @@ -3,7 +3,7 @@ package base import ( "time" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) type Voteproof interface { diff --git a/base/voteproof_isvalid.go b/base/voteproof_isvalid.go index 8c3376ab..d94993cb 100644 --- a/base/voteproof_isvalid.go +++ b/base/voteproof_isvalid.go @@ -1,7 +1,7 @@ package base import ( - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) func IsValidVoteproof(vp Voteproof, networkID NetworkID) error { diff --git a/example/.gitignore b/example/.gitignore deleted file mode 100644 index f6713866..00000000 --- a/example/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.tmp*.sh -*.pdf diff --git a/example/main.go b/example/main.go index 22dd44f5..843a4d73 100644 --- a/example/main.go +++ b/example/main.go @@ -5,13 +5,13 @@ import ( "fmt" "os" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/launch" + launchcmd "github.com/ProtoconNet/mitum2/launch/cmd" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/alecthomas/kong" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/launch" - launchcmd "github.com/spikeekips/mitum/launch/cmd" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) var ( diff --git a/go.mod b/go.mod index e791cfb1..d12d2071 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/spikeekips/mitum +module github.com/ProtoconNet/mitum2 go 1.21 @@ -11,6 +11,7 @@ require ( github.com/bluele/gcache v0.0.2 github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 + github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/bytedance/sonic v1.10.2 github.com/gofrs/uuid v4.4.0+incompatible github.com/hashicorp/consul/api v1.26.1 diff --git a/go.sum b/go.sum index 6ff7c8fe..1b7f6e0b 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,7 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DmitriyVTitov/size v1.5.0/go.mod h1:le6rNI4CoLQV1b9gzp1+3d7hMAD/uu2QcJ+aYbNgiU0= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0= github.com/alecthomas/assert/v2 v2.1.0/go.mod h1:b/+1DI2Q6NckYi+3mXyH3wFb8qG37K/DuK80n7WefXA= github.com/alecthomas/kong v0.8.1 h1:acZdn3m4lLRobeh3Zi2S2EpnXTd1mOL6U7xVml+vfkY= @@ -36,10 +37,20 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= +github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= +github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= +github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= +github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= +github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= +github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= +github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= +github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= @@ -62,6 +73,7 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -185,11 +197,14 @@ github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= @@ -244,12 +259,14 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+ github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU= github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= @@ -339,11 +356,13 @@ go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc= golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= diff --git a/isaac/ballot.go b/isaac/ballot.go index 386870a3..a6d4f1db 100644 --- a/isaac/ballot.go +++ b/isaac/ballot.go @@ -4,10 +4,10 @@ import ( "sort" "strings" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" "golang.org/x/exp/slices" ) diff --git a/isaac/ballot_fact.go b/isaac/ballot_fact.go index af409be0..960bd4c6 100644 --- a/isaac/ballot_fact.go +++ b/isaac/ballot_fact.go @@ -1,10 +1,10 @@ package isaac import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" ) var ( diff --git a/isaac/ballot_fact_json.go b/isaac/ballot_fact_json.go index 5ee9025e..0c68b9ef 100644 --- a/isaac/ballot_fact_json.go +++ b/isaac/ballot_fact_json.go @@ -1,10 +1,10 @@ package isaac import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/valuehash" ) type baseBallotFactJSONMarshaler struct { diff --git a/isaac/ballot_fact_test.go b/isaac/ballot_fact_test.go index 0b947252..ea648102 100644 --- a/isaac/ballot_fact_test.go +++ b/isaac/ballot_fact_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/ballot_json.go b/isaac/ballot_json.go index 9b148607..055ebabb 100644 --- a/isaac/ballot_json.go +++ b/isaac/ballot_json.go @@ -3,10 +3,10 @@ package isaac import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" ) type baseBallotJSONMarshaler struct { diff --git a/isaac/ballot_sign.go b/isaac/ballot_sign.go index 2f4c79b1..07813439 100644 --- a/isaac/ballot_sign.go +++ b/isaac/ballot_sign.go @@ -1,10 +1,10 @@ package isaac import ( + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) var ( diff --git a/isaac/ballot_sign_json.go b/isaac/ballot_sign_json.go index fa47e456..0b3c98db 100644 --- a/isaac/ballot_sign_json.go +++ b/isaac/ballot_sign_json.go @@ -3,10 +3,10 @@ package isaac import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" ) type baseBallotSignFactJSONMarshaler struct { diff --git a/isaac/ballot_sign_test.go b/isaac/ballot_sign_test.go index 1ffa0ddb..f54ae6a5 100644 --- a/isaac/ballot_sign_test.go +++ b/isaac/ballot_sign_test.go @@ -3,11 +3,11 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/ballot_test.go b/isaac/ballot_test.go index 74aa5e98..2ec9d9c3 100644 --- a/isaac/ballot_test.go +++ b/isaac/ballot_test.go @@ -3,11 +3,11 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/block.go b/isaac/block.go index b8e3b088..29814e91 100644 --- a/isaac/block.go +++ b/isaac/block.go @@ -9,13 +9,13 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/valuehash" ) var ( diff --git a/isaac/block/import_block.go b/isaac/block/import_block.go index d0814b2c..bae9ae20 100644 --- a/isaac/block/import_block.go +++ b/isaac/block/import_block.go @@ -4,10 +4,10 @@ import ( "context" "io" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" ) func ImportBlocks( diff --git a/isaac/block/import_block_test.go b/isaac/block/import_block_test.go index e210616b..9dd7aa20 100644 --- a/isaac/block/import_block_test.go +++ b/isaac/block/import_block_test.go @@ -7,12 +7,12 @@ import ( "os" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/block/importer.go b/isaac/block/importer.go index 4ef0e0fb..2eaa7d48 100644 --- a/isaac/block/importer.go +++ b/isaac/block/importer.go @@ -6,12 +6,12 @@ import ( "io" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" ) type ( diff --git a/isaac/block/importer_test.go b/isaac/block/importer_test.go index 26013d7c..79e0e14a 100644 --- a/isaac/block/importer_test.go +++ b/isaac/block/importer_test.go @@ -7,11 +7,11 @@ import ( "path/filepath" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/isaac/block/localfs_importer.go b/isaac/block/localfs_importer.go index 3d8b1e8a..f2830a2a 100644 --- a/isaac/block/localfs_importer.go +++ b/isaac/block/localfs_importer.go @@ -7,12 +7,12 @@ import ( "os" "path/filepath" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" ) type LocalFSImporter struct { diff --git a/isaac/block/localfs_writer.go b/isaac/block/localfs_writer.go index 546e130e..e092b950 100644 --- a/isaac/block/localfs_writer.go +++ b/isaac/block/localfs_writer.go @@ -17,13 +17,13 @@ import ( "sync" "sync/atomic" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/hint" ) var LocalFSWriterHint = hint.MustNewHint("block-localfs-writer-v0.0.1") @@ -482,7 +482,7 @@ func (w *LocalFSWriter) setTree( } func (w *LocalFSWriter) saveMap() error { - e := util.StringError("filed to save map") + e := util.StringError("failed to save map") // NOTE sign blockmap by local node if err := w.m.Sign(w.local.Address(), w.local.Privatekey(), w.networkID); err != nil { diff --git a/isaac/block/localfs_writer_test.go b/isaac/block/localfs_writer_test.go index 5ed5829e..c20a6282 100644 --- a/isaac/block/localfs_writer_test.go +++ b/isaac/block/localfs_writer_test.go @@ -10,13 +10,13 @@ import ( "path/filepath" "testing" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" "go.uber.org/goleak" "golang.org/x/sync/semaphore" diff --git a/isaac/block/map.go b/isaac/block/map.go index 863769e5..f2446a4e 100644 --- a/isaac/block/map.go +++ b/isaac/block/map.go @@ -4,10 +4,10 @@ import ( "bytes" "sort" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) var BlockMapHint = hint.MustNewHint("blockmap-v0.0.1") diff --git a/isaac/block/map_json.go b/isaac/block/map_json.go index 1340663a..be5b876c 100644 --- a/isaac/block/map_json.go +++ b/isaac/block/map_json.go @@ -3,10 +3,10 @@ package isaacblock import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" ) type blockMapJSONMarshaler struct { diff --git a/isaac/block/map_test.go b/isaac/block/map_test.go index 3dc3f0c6..e3dd5663 100644 --- a/isaac/block/map_test.go +++ b/isaac/block/map_test.go @@ -3,12 +3,12 @@ package isaacblock import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/block/reader.go b/isaac/block/reader.go index 0e260f48..3a521a11 100644 --- a/isaac/block/reader.go +++ b/isaac/block/reader.go @@ -5,12 +5,12 @@ import ( "io" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" ) type ItemReader struct { diff --git a/isaac/block/reader_test.go b/isaac/block/reader_test.go index 1b8d0b14..5ffa1c62 100644 --- a/isaac/block/reader_test.go +++ b/isaac/block/reader_test.go @@ -10,11 +10,11 @@ import ( "sync" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" "github.com/stretchr/testify/suite" ) diff --git a/isaac/block/readers_test.go b/isaac/block/readers_test.go index 0b689409..ae0dffd3 100644 --- a/isaac/block/readers_test.go +++ b/isaac/block/readers_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/logging" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/stretchr/testify/suite" ) diff --git a/isaac/block/states_merger.go b/isaac/block/states_merger.go index 4e63a625..48df731b 100644 --- a/isaac/block/states_merger.go +++ b/isaac/block/states_merger.go @@ -4,9 +4,9 @@ import ( "context" "sort" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" ) type StatesMerger interface { diff --git a/isaac/block/states_merger_test.go b/isaac/block/states_merger_test.go index 3027f245..eb84426c 100644 --- a/isaac/block/states_merger_test.go +++ b/isaac/block/states_merger_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" "go.uber.org/goleak" "golang.org/x/sync/semaphore" diff --git a/isaac/block/suffrage.go b/isaac/block/suffrage.go index 789f989e..73e6b31b 100644 --- a/isaac/block/suffrage.go +++ b/isaac/block/suffrage.go @@ -1,11 +1,11 @@ package isaacblock import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/hint" ) var SuffrageProofHint = hint.MustNewHint("suffrage-proof-v0.0.1") diff --git a/isaac/block/suffrage_json.go b/isaac/block/suffrage_json.go index 3e9f1c8c..2dac82df 100644 --- a/isaac/block/suffrage_json.go +++ b/isaac/block/suffrage_json.go @@ -3,11 +3,11 @@ package isaacblock import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/hint" ) type SuffrageProofJSONMarshaler struct { diff --git a/isaac/block/suffrage_test.go b/isaac/block/suffrage_test.go index 9ddf8575..514ee1fa 100644 --- a/isaac/block/suffrage_test.go +++ b/isaac/block/suffrage_test.go @@ -3,15 +3,15 @@ package isaacblock import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/isaac/block/test_importer.go b/isaac/block/test_importer.go index 29246b69..1ad0fdce 100644 --- a/isaac/block/test_importer.go +++ b/isaac/block/test_importer.go @@ -13,13 +13,13 @@ import ( "strings" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/valuehash" ) type DummyBlockImporter struct { diff --git a/isaac/block/validator.go b/isaac/block/validator.go index b93f1dc1..b308a41f 100644 --- a/isaac/block/validator.go +++ b/isaac/block/validator.go @@ -5,11 +5,11 @@ import ( "os" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/fixedtree" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/fixedtree" ) var ( @@ -284,7 +284,7 @@ func IsValidBlockFromLocalFS( bm = i } - pr, ops, sts, opstree, ststree, vps, err := loadBlockItemsFromReader(bm, itemf, height) + pr, ops, sts, opstree, ststree, vps, err := LoadBlockItemsFromReader(bm, itemf, height) if err != nil { return err } @@ -308,7 +308,7 @@ func IsValidBlockFromLocalFS( return isValidVoteproofsFromLocalFS(networkID, vps, bm.Manifest()) } -func loadBlockItemsFromReader( //revive:disable-line:function-result-limit +func LoadBlockItemsFromReader( //revive:disable-line:function-result-limit bm base.BlockMap, itemf isaac.BlockItemReadersItemFunc, height base.Height, diff --git a/isaac/block/validator_test.go b/isaac/block/validator_test.go index 6d318821..be86dec1 100644 --- a/isaac/block/validator_test.go +++ b/isaac/block/validator_test.go @@ -6,11 +6,11 @@ import ( "path/filepath" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/isaac/block/writer.go b/isaac/block/writer.go index 1462ff31..45e3fc30 100644 --- a/isaac/block/writer.go +++ b/isaac/block/writer.go @@ -4,13 +4,13 @@ import ( "context" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/logging" ) type FSWriter interface { diff --git a/isaac/block/writer_test.go b/isaac/block/writer_test.go index 36f4af2d..dd2a289f 100644 --- a/isaac/block/writer_test.go +++ b/isaac/block/writer_test.go @@ -5,11 +5,11 @@ import ( "math" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" "go.uber.org/goleak" "golang.org/x/sync/semaphore" diff --git a/isaac/block_json.go b/isaac/block_json.go index 90d2fe67..e3fac36b 100644 --- a/isaac/block_json.go +++ b/isaac/block_json.go @@ -5,12 +5,12 @@ import ( "net/url" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/valuehash" ) type ManifestJSONMarshaler struct { diff --git a/isaac/block_test.go b/isaac/block_test.go index f7c51d63..7270aaaf 100644 --- a/isaac/block_test.go +++ b/isaac/block_test.go @@ -4,11 +4,11 @@ import ( "net/url" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/block_writer.go b/isaac/block_writer.go index 5353efc4..8963303e 100644 --- a/isaac/block_writer.go +++ b/isaac/block_writer.go @@ -4,9 +4,9 @@ import ( "context" "io" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" ) type BlockWriter interface { diff --git a/isaac/database.go b/isaac/database.go index db41dca7..20dd127c 100644 --- a/isaac/database.go +++ b/isaac/database.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) // Database serves some of block items like blockmap, states and operations from diff --git a/isaac/database/block_write.go b/isaac/database/block_write.go index ace30afa..1116534c 100644 --- a/isaac/database/block_write.go +++ b/isaac/database/block_write.go @@ -6,13 +6,13 @@ import ( "math" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" "github.com/syndtr/goleveldb/leveldb" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/block_write_test.go b/isaac/database/block_write_test.go index 0b6e9a01..2d73b632 100644 --- a/isaac/database/block_write_test.go +++ b/isaac/database/block_write_test.go @@ -5,11 +5,11 @@ import ( "sort" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/database/center.go b/isaac/database/center.go index 43f4eb8f..2512d0c6 100644 --- a/isaac/database/center.go +++ b/isaac/database/center.go @@ -7,15 +7,15 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/center_test.go b/isaac/database/center_test.go index 26ed9ac3..72b3dd4c 100644 --- a/isaac/database/center_test.go +++ b/isaac/database/center_test.go @@ -5,14 +5,14 @@ import ( "sort" "testing" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" "github.com/syndtr/goleveldb/leveldb" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" diff --git a/isaac/database/frame.go b/isaac/database/frame.go index cf796336..0e7a9d34 100644 --- a/isaac/database/frame.go +++ b/isaac/database/frame.go @@ -3,13 +3,13 @@ package isaacdatabase import ( "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/valuehash" ) func writeFrame(headers [][]byte, b []byte) ([]byte, error) { diff --git a/isaac/database/leveldb.go b/isaac/database/leveldb.go index ac88a0f9..6d98c177 100644 --- a/isaac/database/leveldb.go +++ b/isaac/database/leveldb.go @@ -3,14 +3,14 @@ package isaacdatabase import ( "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/localtime" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/localtime" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/perm_base.go b/isaac/database/perm_base.go index 45339b2f..0179a2b3 100644 --- a/isaac/database/perm_base.go +++ b/isaac/database/perm_base.go @@ -1,9 +1,9 @@ package isaacdatabase import ( + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" ) type basePermanent struct { diff --git a/isaac/database/perm_leveldb.go b/isaac/database/perm_leveldb.go index b97ea92b..339addf6 100644 --- a/isaac/database/perm_leveldb.go +++ b/isaac/database/perm_leveldb.go @@ -4,15 +4,15 @@ import ( "context" "math" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/perm_leveldb_test.go b/isaac/database/perm_leveldb_test.go index 57ceef60..14b761dd 100644 --- a/isaac/database/perm_leveldb_test.go +++ b/isaac/database/perm_leveldb_test.go @@ -3,10 +3,10 @@ package isaacdatabase import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/isaac/database/perm_redis.go b/isaac/database/perm_redis.go index 83c67e89..fd73d0bb 100644 --- a/isaac/database/perm_redis.go +++ b/isaac/database/perm_redis.go @@ -6,17 +6,17 @@ import ( "strings" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + redisstorage "github.com/ProtoconNet/mitum2/storage/redis" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" "github.com/redis/go-redis/v9" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - redisstorage "github.com/spikeekips/mitum/storage/redis" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/perm_redis_test.go b/isaac/database/perm_redis_test.go index 32593eaf..280235e1 100644 --- a/isaac/database/perm_redis_test.go +++ b/isaac/database/perm_redis_test.go @@ -7,12 +7,12 @@ import ( "context" "testing" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + redisstorage "github.com/ProtoconNet/mitum2/storage/redis" + "github.com/ProtoconNet/mitum2/util" "github.com/alicebob/miniredis/v2" "github.com/redis/go-redis/v9" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - redisstorage "github.com/spikeekips/mitum/storage/redis" - "github.com/spikeekips/mitum/util" "github.com/stretchr/testify/suite" ) diff --git a/isaac/database/perm_test.go b/isaac/database/perm_test.go index ae854a96..776099e7 100644 --- a/isaac/database/perm_test.go +++ b/isaac/database/perm_test.go @@ -3,10 +3,10 @@ package isaacdatabase import ( "context" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" ) type testCommonPermanent struct { diff --git a/isaac/database/pool.go b/isaac/database/pool.go index a2045cea..5362d7bb 100644 --- a/isaac/database/pool.go +++ b/isaac/database/pool.go @@ -6,14 +6,14 @@ import ( "math" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/valuehash" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/pool_test.go b/isaac/database/pool_test.go index 3b08537f..2a83b678 100644 --- a/isaac/database/pool_test.go +++ b/isaac/database/pool_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/temp_leveldb.go b/isaac/database/temp_leveldb.go index 8fc816cf..f51083bc 100644 --- a/isaac/database/temp_leveldb.go +++ b/isaac/database/temp_leveldb.go @@ -4,13 +4,13 @@ import ( "bytes" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/temp_leveldb_test.go b/isaac/database/temp_leveldb_test.go index b6b22cca..b22e72f6 100644 --- a/isaac/database/temp_leveldb_test.go +++ b/isaac/database/temp_leveldb_test.go @@ -4,11 +4,11 @@ import ( "os" "testing" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/temp_sync_leveldb.go b/isaac/database/temp_sync_leveldb.go index 8fba4ef5..8d350cf7 100644 --- a/isaac/database/temp_sync_leveldb.go +++ b/isaac/database/temp_sync_leveldb.go @@ -1,11 +1,11 @@ package isaacdatabase import ( + "github.com/ProtoconNet/mitum2/base" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/isaac/database/temp_sync_mem.go b/isaac/database/temp_sync_mem.go index aa99580a..734d74ca 100644 --- a/isaac/database/temp_sync_mem.go +++ b/isaac/database/temp_sync_mem.go @@ -3,8 +3,8 @@ package isaacdatabase import ( "sync" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" ) type MemTempSyncPool struct { diff --git a/isaac/database/test_database.go b/isaac/database/test_database.go index ca16b450..695d213f 100644 --- a/isaac/database/test_database.go +++ b/isaac/database/test_database.go @@ -7,15 +7,15 @@ import ( "encoding/json" "os" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/assert" ) diff --git a/isaac/last_consensus_nodes_watcher.go b/isaac/last_consensus_nodes_watcher.go index b0e43b0a..97e77a29 100644 --- a/isaac/last_consensus_nodes_watcher.go +++ b/isaac/last_consensus_nodes_watcher.go @@ -4,11 +4,11 @@ import ( "context" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) type LastConsensusNodesWatcher struct { diff --git a/isaac/last_voteproofs.go b/isaac/last_voteproofs.go index eac6795d..5d6ffd58 100644 --- a/isaac/last_voteproofs.go +++ b/isaac/last_voteproofs.go @@ -3,8 +3,8 @@ package isaac import ( "sync" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" ) type LastVoteproofs struct { diff --git a/isaac/last_voteproofs_test.go b/isaac/last_voteproofs_test.go index e3f64418..0618c83a 100644 --- a/isaac/last_voteproofs_test.go +++ b/isaac/last_voteproofs_test.go @@ -3,8 +3,8 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/lastpoint.go b/isaac/lastpoint.go index c64fbf31..c2598aa4 100644 --- a/isaac/lastpoint.go +++ b/isaac/lastpoint.go @@ -1,8 +1,8 @@ package isaac import ( + "github.com/ProtoconNet/mitum2/base" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" ) type LastPoint struct { diff --git a/isaac/lastpoint_test.go b/isaac/lastpoint_test.go index e8bb6bf7..2b01dafa 100644 --- a/isaac/lastpoint_test.go +++ b/isaac/lastpoint_test.go @@ -3,7 +3,7 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" + "github.com/ProtoconNet/mitum2/base" "github.com/stretchr/testify/suite" ) diff --git a/isaac/network.go b/isaac/network.go index 1dbd6403..6957017e 100644 --- a/isaac/network.go +++ b/isaac/network.go @@ -5,10 +5,10 @@ import ( "io" "net/url" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" ) type NetworkClient interface { //nolint:interfacebloat //.. diff --git a/isaac/network/client.go b/isaac/network/client.go index ff209341..3d1c9225 100644 --- a/isaac/network/client.go +++ b/isaac/network/client.go @@ -6,14 +6,14 @@ import ( "io" "net/url" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" ) type BaseClient struct { @@ -639,6 +639,24 @@ func (c *BaseClient) ExistsInStateOperation( return found, err } +func (c *BaseClient) NodeInfo( + ctx context.Context, + broker *quicstreamheader.ClientBroker, +) (NodeInfo, bool, error) { + var ni NodeInfo + + ok, err := HCReqResBodyDecOK( + ctx, + broker, + NewNodeInfoRequestHeader(), + func(enc encoder.Encoder, r io.Reader) error { + return encoder.DecodeReader(enc, r, &ni) + }, + ) + + return ni, ok, err +} + func (c *BaseClient) SendBallots( ctx context.Context, ci quicstream.ConnInfo, diff --git a/isaac/network/conn.go b/isaac/network/conn.go index a1f9a1ef..43f8cd21 100644 --- a/isaac/network/conn.go +++ b/isaac/network/conn.go @@ -1,13 +1,13 @@ package isaacnetwork import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" ) var NodeConnInfoHint = hint.MustNewHint("node-conninfo-v0.0.1") diff --git a/isaac/network/conn_test.go b/isaac/network/conn_test.go index e2c97d0f..1c78b66a 100644 --- a/isaac/network/conn_test.go +++ b/isaac/network/conn_test.go @@ -4,12 +4,12 @@ import ( "net" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" ) diff --git a/isaac/network/header.go b/isaac/network/header.go index cd3a2a4d..b6c4d929 100644 --- a/isaac/network/header.go +++ b/isaac/network/header.go @@ -3,12 +3,12 @@ package isaacnetwork import ( "net/url" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) var ( diff --git a/isaac/network/header_json.go b/isaac/network/header_json.go index f2d0129c..8158d611 100644 --- a/isaac/network/header_json.go +++ b/isaac/network/header_json.go @@ -3,13 +3,13 @@ package isaacnetwork import ( "net/url" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/valuehash" ) type BaseHeaderJSONMarshaler struct { diff --git a/isaac/network/header_json_test.go b/isaac/network/header_json_test.go index 10905058..e5920d04 100644 --- a/isaac/network/header_json_test.go +++ b/isaac/network/header_json_test.go @@ -4,13 +4,13 @@ import ( "net/url" "testing" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/network/node_info.go b/isaac/network/node_info.go index a5657fbc..0a075cd1 100644 --- a/isaac/network/node_info.go +++ b/isaac/network/node_info.go @@ -4,13 +4,13 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" ) var NodeInfoHint = hint.MustNewHint("node-info-v0.0.1") diff --git a/isaac/network/node_info_json.go b/isaac/network/node_info_json.go index be197124..868fa9ea 100644 --- a/isaac/network/node_info_json.go +++ b/isaac/network/node_info_json.go @@ -3,13 +3,13 @@ package isaacnetwork import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" ) type NodeInfoLocalJSONMarshaler struct { diff --git a/isaac/network/node_info_test.go b/isaac/network/node_info_test.go index e81af056..e81518d6 100644 --- a/isaac/network/node_info_test.go +++ b/isaac/network/node_info_test.go @@ -4,14 +4,14 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/network/quicstream_handlers.go b/isaac/network/quicstream_handlers.go index 0ad51163..47c0e0ee 100644 --- a/isaac/network/quicstream_handlers.go +++ b/isaac/network/quicstream_handlers.go @@ -8,14 +8,14 @@ import ( "net/url" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/valuehash" "golang.org/x/sync/singleflight" ) diff --git a/isaac/network/quicstream_handlers_handover.go b/isaac/network/quicstream_handlers_handover.go index 7d3410eb..ff9337b7 100644 --- a/isaac/network/quicstream_handlers_handover.go +++ b/isaac/network/quicstream_handlers_handover.go @@ -5,11 +5,11 @@ import ( "io" "net" - "github.com/spikeekips/mitum/base" - isaacstates "github.com/spikeekips/mitum/isaac/states" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" + "github.com/ProtoconNet/mitum2/base" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" ) func QuicstreamHandlerStartHandover( diff --git a/isaac/network/quicstream_handlers_handover_test.go b/isaac/network/quicstream_handlers_handover_test.go index ad6e080c..13284856 100644 --- a/isaac/network/quicstream_handlers_handover_test.go +++ b/isaac/network/quicstream_handlers_handover_test.go @@ -5,12 +5,12 @@ import ( "net" "time" + "github.com/ProtoconNet/mitum2/base" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" ) func (t *testQuicstreamHandlers) TestStartHandover() { diff --git a/isaac/network/quicstream_handlers_test.go b/isaac/network/quicstream_handlers_test.go index 473e21b3..2592370a 100644 --- a/isaac/network/quicstream_handlers_test.go +++ b/isaac/network/quicstream_handlers_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/isaac/network/sync.go b/isaac/network/sync.go index 8ce9cea8..cecf0e29 100644 --- a/isaac/network/sync.go +++ b/isaac/network/sync.go @@ -10,16 +10,16 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" ) type SyncSourceType string diff --git a/isaac/network/sync_test.go b/isaac/network/sync_test.go index 9be9674e..bf9b2be8 100644 --- a/isaac/network/sync_test.go +++ b/isaac/network/sync_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util/encoder" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) @@ -424,7 +424,7 @@ func (t *testSyncSourceChecker) TestCalled() { func TestSyncSourceChecker(t *testing.T) { defer goleak.VerifyNone(t, goleak.IgnoreTopFunction("github.com/syndtr/goleveldb/leveldb.(*DB).mpoolDrain"), - goleak.IgnoreTopFunction("github.com/spikeekips/mitum/util.EnsureRead.func1"), + goleak.IgnoreTopFunction("github.com/ProtoconNet/mitum2/util.EnsureRead.func1"), ) suite.Run(t, new(testSyncSourceChecker)) diff --git a/isaac/network/sync_yaml.go b/isaac/network/sync_yaml.go index c1f7f144..b9eed091 100644 --- a/isaac/network/sync_yaml.go +++ b/isaac/network/sync_yaml.go @@ -3,13 +3,13 @@ package isaacnetwork import ( "net/url" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" "gopkg.in/yaml.v3" ) diff --git a/isaac/network/tests.go b/isaac/network/tests.go index 71cd459a..4b57fd46 100644 --- a/isaac/network/tests.go +++ b/isaac/network/tests.go @@ -8,10 +8,10 @@ import ( "io" "net" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util/encoder" ) type DummyStreamer struct { diff --git a/isaac/network_policy.go b/isaac/network_policy.go index fdf2b7b1..689a4837 100644 --- a/isaac/network_policy.go +++ b/isaac/network_policy.go @@ -1,9 +1,9 @@ package isaac import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) var ( diff --git a/isaac/network_policy_json.go b/isaac/network_policy_json.go index 062f336f..6e9ce1a7 100644 --- a/isaac/network_policy_json.go +++ b/isaac/network_policy_json.go @@ -3,10 +3,10 @@ package isaac import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" ) type networkPolicyJSONMarshaler struct { diff --git a/isaac/network_policy_test.go b/isaac/network_policy_test.go index 844db23c..128ead7d 100644 --- a/isaac/network_policy_test.go +++ b/isaac/network_policy_test.go @@ -3,11 +3,11 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/node.go b/isaac/node.go index 905ae7b1..a3004fc2 100644 --- a/isaac/node.go +++ b/isaac/node.go @@ -1,8 +1,8 @@ package isaac import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util/hint" ) var NodeHint = hint.MustNewHint("node-v0.0.1") diff --git a/isaac/node_test.go b/isaac/node_test.go index dd2a9648..ec88bca2 100644 --- a/isaac/node_test.go +++ b/isaac/node_test.go @@ -3,9 +3,9 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" ) diff --git a/isaac/operation.go b/isaac/operation.go index f2a7aa79..f9fd9b99 100644 --- a/isaac/operation.go +++ b/isaac/operation.go @@ -1,8 +1,8 @@ package isaac import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util/hint" ) type OperationProcessHandler interface { diff --git a/isaac/operation/policy_network.go b/isaac/operation/policy_network.go index e3e3b825..bf06b659 100644 --- a/isaac/operation/policy_network.go +++ b/isaac/operation/policy_network.go @@ -3,12 +3,12 @@ package isaacoperation import ( "context" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/valuehash" ) var ( diff --git a/isaac/operation/policy_network_json.go b/isaac/operation/policy_network_json.go index 841fab49..ad5ae298 100644 --- a/isaac/operation/policy_network_json.go +++ b/isaac/operation/policy_network_json.go @@ -3,9 +3,9 @@ package isaacoperation import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" ) type baseNetworkPolicyFactJSONMarshaler struct { diff --git a/isaac/operation/policy_network_processor.go b/isaac/operation/policy_network_processor.go index 94ff1907..45a38877 100644 --- a/isaac/operation/policy_network_processor.go +++ b/isaac/operation/policy_network_processor.go @@ -3,10 +3,10 @@ package isaacoperation import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" ) type NetworkPolicyProcessor struct { diff --git a/isaac/operation/policy_network_processor_test.go b/isaac/operation/policy_network_processor_test.go index 0a591983..9a1c54f6 100644 --- a/isaac/operation/policy_network_processor_test.go +++ b/isaac/operation/policy_network_processor_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/operation/policy_network_test.go b/isaac/operation/policy_network_test.go index bf0315db..5dac50e3 100644 --- a/isaac/operation/policy_network_test.go +++ b/isaac/operation/policy_network_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" ) diff --git a/isaac/operation/suffrage_candidate.go b/isaac/operation/suffrage_candidate.go index becbb5c4..11c1ce06 100644 --- a/isaac/operation/suffrage_candidate.go +++ b/isaac/operation/suffrage_candidate.go @@ -1,10 +1,10 @@ package isaacoperation import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" ) var ( diff --git a/isaac/operation/suffrage_candidate_json.go b/isaac/operation/suffrage_candidate_json.go index 68e06edb..46f39e03 100644 --- a/isaac/operation/suffrage_candidate_json.go +++ b/isaac/operation/suffrage_candidate_json.go @@ -1,9 +1,9 @@ package isaacoperation import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" ) type suffrageCandidateFactJSONMarshaler struct { diff --git a/isaac/operation/suffrage_candidate_processor.go b/isaac/operation/suffrage_candidate_processor.go index 0b35be07..978df0ef 100644 --- a/isaac/operation/suffrage_candidate_processor.go +++ b/isaac/operation/suffrage_candidate_processor.go @@ -6,10 +6,10 @@ import ( "strings" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" ) type SuffrageCandidateProcessor struct { diff --git a/isaac/operation/suffrage_candidate_processor_test.go b/isaac/operation/suffrage_candidate_processor_test.go index 55cc36e0..fd86f0f4 100644 --- a/isaac/operation/suffrage_candidate_processor_test.go +++ b/isaac/operation/suffrage_candidate_processor_test.go @@ -7,10 +7,10 @@ import ( "sync" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/operation/suffrage_candidate_test.go b/isaac/operation/suffrage_candidate_test.go index a2aac7c3..ca2cad66 100644 --- a/isaac/operation/suffrage_candidate_test.go +++ b/isaac/operation/suffrage_candidate_test.go @@ -3,10 +3,10 @@ package isaacoperation import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" ) diff --git a/isaac/operation/suffrage_disjoin.go b/isaac/operation/suffrage_disjoin.go index e073c71b..d5a8f2ec 100644 --- a/isaac/operation/suffrage_disjoin.go +++ b/isaac/operation/suffrage_disjoin.go @@ -1,10 +1,10 @@ package isaacoperation import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" ) var ( diff --git a/isaac/operation/suffrage_disjoin_json.go b/isaac/operation/suffrage_disjoin_json.go index 5464dc07..168f2077 100644 --- a/isaac/operation/suffrage_disjoin_json.go +++ b/isaac/operation/suffrage_disjoin_json.go @@ -1,9 +1,9 @@ package isaacoperation import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" ) type suffrageDisjoinFactJSONMarshaler struct { diff --git a/isaac/operation/suffrage_disjoin_processor.go b/isaac/operation/suffrage_disjoin_processor.go index a1a713bc..a11804e0 100644 --- a/isaac/operation/suffrage_disjoin_processor.go +++ b/isaac/operation/suffrage_disjoin_processor.go @@ -3,9 +3,9 @@ package isaacoperation import ( "context" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" "golang.org/x/exp/slices" ) diff --git a/isaac/operation/suffrage_disjoin_processor_test.go b/isaac/operation/suffrage_disjoin_processor_test.go index aebc5a86..6af978fa 100644 --- a/isaac/operation/suffrage_disjoin_processor_test.go +++ b/isaac/operation/suffrage_disjoin_processor_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/operation/suffrage_disjoin_test.go b/isaac/operation/suffrage_disjoin_test.go index d538da68..2286a285 100644 --- a/isaac/operation/suffrage_disjoin_test.go +++ b/isaac/operation/suffrage_disjoin_test.go @@ -4,11 +4,11 @@ import ( "strings" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/operation/suffrage_expel_processor.go b/isaac/operation/suffrage_expel_processor.go index 6c9f283c..3c59f005 100644 --- a/isaac/operation/suffrage_expel_processor.go +++ b/isaac/operation/suffrage_expel_processor.go @@ -3,9 +3,9 @@ package isaacoperation import ( "context" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" ) var ExpelPreProcessedContextKey = util.ContextKey("expel-preprocessed") diff --git a/isaac/operation/suffrage_expel_processor_test.go b/isaac/operation/suffrage_expel_processor_test.go index f79bf2f8..bc726003 100644 --- a/isaac/operation/suffrage_expel_processor_test.go +++ b/isaac/operation/suffrage_expel_processor_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/operation/suffrage_join.go b/isaac/operation/suffrage_join.go index e11644c1..c77248df 100644 --- a/isaac/operation/suffrage_join.go +++ b/isaac/operation/suffrage_join.go @@ -4,11 +4,11 @@ import ( "bytes" "context" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" ) var ( diff --git a/isaac/operation/suffrage_join_json.go b/isaac/operation/suffrage_join_json.go index 9f815c2e..a3d3d913 100644 --- a/isaac/operation/suffrage_join_json.go +++ b/isaac/operation/suffrage_join_json.go @@ -3,9 +3,9 @@ package isaacoperation import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" ) type suffrageJoinFactJSONMarshaler struct { diff --git a/isaac/operation/suffrage_join_processor.go b/isaac/operation/suffrage_join_processor.go index a26242cb..2e4d604e 100644 --- a/isaac/operation/suffrage_join_processor.go +++ b/isaac/operation/suffrage_join_processor.go @@ -6,10 +6,10 @@ import ( "strings" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" ) type SuffrageJoinProcessor struct { diff --git a/isaac/operation/suffrage_join_processor_test.go b/isaac/operation/suffrage_join_processor_test.go index bc01d5fc..3100dcfd 100644 --- a/isaac/operation/suffrage_join_processor_test.go +++ b/isaac/operation/suffrage_join_processor_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/operation/suffrage_join_test.go b/isaac/operation/suffrage_join_test.go index 85e4eedb..570e343f 100644 --- a/isaac/operation/suffrage_join_test.go +++ b/isaac/operation/suffrage_join_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/params.go b/isaac/params.go index 330e363c..50763e30 100644 --- a/isaac/params.go +++ b/isaac/params.go @@ -4,10 +4,10 @@ import ( "reflect" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) var ParamsHint = hint.MustNewHint("isaac-params-v0.0.1") diff --git a/isaac/params_test.go b/isaac/params_test.go index dfe8cf05..079210b7 100644 --- a/isaac/params_test.go +++ b/isaac/params_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" ) diff --git a/isaac/proposal.go b/isaac/proposal.go index 8925e004..cb5bc6e1 100644 --- a/isaac/proposal.go +++ b/isaac/proposal.go @@ -3,12 +3,12 @@ package isaac import ( "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/valuehash" ) var ( diff --git a/isaac/proposal_fact_test.go b/isaac/proposal_fact_test.go index 108926d7..fec8452d 100644 --- a/isaac/proposal_fact_test.go +++ b/isaac/proposal_fact_test.go @@ -3,11 +3,11 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/proposal_json.go b/isaac/proposal_json.go index bf42c5f8..acdf56c7 100644 --- a/isaac/proposal_json.go +++ b/isaac/proposal_json.go @@ -3,12 +3,12 @@ package isaac import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/valuehash" ) type proposalFactJSONMarshaler struct { diff --git a/isaac/proposal_maker.go b/isaac/proposal_maker.go index 24684f9a..d3f3692c 100644 --- a/isaac/proposal_maker.go +++ b/isaac/proposal_maker.go @@ -4,11 +4,11 @@ import ( "context" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) type ProposalMaker struct { diff --git a/isaac/proposal_maker_test.go b/isaac/proposal_maker_test.go index ea069635..e14cb7ef 100644 --- a/isaac/proposal_maker_test.go +++ b/isaac/proposal_maker_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/proposal_processor.go b/isaac/proposal_processor.go index 937480d2..feacc4dd 100644 --- a/isaac/proposal_processor.go +++ b/isaac/proposal_processor.go @@ -6,12 +6,12 @@ import ( "sync" "sync/atomic" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/logging" ) var ( @@ -509,10 +509,10 @@ func (p *DefaultProposalProcessor) doProcessOperation( return e.Errorf("not empty state must have empty reason") default: instate := len(stvs) > 0 - if instate { - if err := writer.SetStates(ctx, opsindex, stvs, op); err != nil { - return e.Wrap(err) - } + + // NOTE: origin checks instate condition + if err := writer.SetStates(ctx, opsindex, stvs, op); err != nil { + return e.Wrap(err) } if err := writer.SetProcessResult( diff --git a/isaac/proposal_processor_test.go b/isaac/proposal_processor_test.go index 0b3774da..a697af90 100644 --- a/isaac/proposal_processor_test.go +++ b/isaac/proposal_processor_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" "go.uber.org/goleak" "golang.org/x/exp/slices" diff --git a/isaac/proposal_processors.go b/isaac/proposal_processors.go index 8d7981b3..7dedc031 100644 --- a/isaac/proposal_processors.go +++ b/isaac/proposal_processors.go @@ -5,11 +5,11 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) // ErrIgnoreErrorProposalProcessor ignores error from proposalProcessor, it means diff --git a/isaac/proposal_processors_test.go b/isaac/proposal_processors_test.go index 305f50d3..ee1ef1e0 100644 --- a/isaac/proposal_processors_test.go +++ b/isaac/proposal_processors_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/proposal_selector.go b/isaac/proposal_selector.go index c1af3bc0..46fcb4c0 100644 --- a/isaac/proposal_selector.go +++ b/isaac/proposal_selector.go @@ -6,10 +6,10 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" ) var errFailedToRequestProposalToNode = util.NewIDError("request proposal to node") diff --git a/isaac/proposal_selector_test.go b/isaac/proposal_selector_test.go index be42f174..639753cc 100644 --- a/isaac/proposal_selector_test.go +++ b/isaac/proposal_selector_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/bluele/gcache" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) @@ -184,10 +184,7 @@ func (t *testBaseProposalSelector) TestNew() { t.T().Logf("available nodes: %d", len(nodes)) - prev, err := valuehash.NewBytesFromString("7591248cde9db72e96dfe17feccb701cc5b2abd62d9d4af755b758c1bf1dae79") - t.NoError(err) - t.T().Log("previous block:", prev) - + prev := valuehash.NewBytesFromString("5pjdLQojuwtQAN1FdEL1V1uvDdZi2koPJWLqJzo27yzBqn8WkNpXgypsF4VUBHwCtgduQw14N3sg7UHSjc6K2B25") point := base.RawPoint(66, 11) pr, err := p.Select(context.Background(), point, prev, 0) t.NoError(err) @@ -200,10 +197,7 @@ func (t *testBaseProposalSelector) TestNew() { t.T().Logf("selected proposer: %q", pr.ProposalFact().Proposer()) t.Run("different previous block", func() { - prev, err = valuehash.NewBytesFromString("7bdd6043068e7026a1fd8592d5f457ffba1ae3bd0869d6f797db16548bc6bc87") - t.NoError(err) - t.T().Log("previous block:", prev) - + prev = valuehash.NewBytesFromString("7bdd6043068e7026a1fd8592d5f457ffba1ae3bd0869d6f797db16548bc6bc87") apr, err := p.Select(context.Background(), point, prev, 0) t.NoError(err) t.NotNil(pr) diff --git a/isaac/proposal_sign_test.go b/isaac/proposal_sign_test.go index 041cb06e..69c72e23 100644 --- a/isaac/proposal_sign_test.go +++ b/isaac/proposal_sign_test.go @@ -3,11 +3,11 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/proposer_selector.go b/isaac/proposer_selector.go index 47140dd8..119e7fea 100644 --- a/isaac/proposer_selector.go +++ b/isaac/proposer_selector.go @@ -3,9 +3,9 @@ package isaac import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" ) // ProposerSelectFunc selects proposer between suffrage nodes. If failed to diff --git a/isaac/readers.go b/isaac/readers.go index 75a9a629..4babc13e 100644 --- a/isaac/readers.go +++ b/isaac/readers.go @@ -15,14 +15,14 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/logging" "golang.org/x/sync/singleflight" ) diff --git a/isaac/states/ballot.go b/isaac/states/ballot.go index 29e6d040..df1a529b 100644 --- a/isaac/states/ballot.go +++ b/isaac/states/ballot.go @@ -3,11 +3,11 @@ package isaacstates import ( "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util/logging" ) type BallotBroadcaster interface { diff --git a/isaac/states/ballot_stuck_resolver.go b/isaac/states/ballot_stuck_resolver.go index 30c66dd0..3ce1d47b 100644 --- a/isaac/states/ballot_stuck_resolver.go +++ b/isaac/states/ballot_stuck_resolver.go @@ -5,15 +5,15 @@ import ( "math" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/logging" "golang.org/x/exp/slices" ) diff --git a/isaac/states/ballot_stuck_resolver_test.go b/isaac/states/ballot_stuck_resolver_test.go index 42b2a22b..c305de3d 100644 --- a/isaac/states/ballot_stuck_resolver_test.go +++ b/isaac/states/ballot_stuck_resolver_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util/logging" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/isaac/states/ballotbox.go b/isaac/states/ballotbox.go index c157b152..4a398d03 100644 --- a/isaac/states/ballotbox.go +++ b/isaac/states/ballotbox.go @@ -7,12 +7,12 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" "golang.org/x/exp/slices" ) diff --git a/isaac/states/ballotbox_test.go b/isaac/states/ballotbox_test.go index 11b55944..3bcd01e9 100644 --- a/isaac/states/ballotbox_test.go +++ b/isaac/states/ballotbox_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" "golang.org/x/exp/slices" "golang.org/x/sync/semaphore" diff --git a/isaac/states/base.go b/isaac/states/base.go index 2c97e014..eb831282 100644 --- a/isaac/states/base.go +++ b/isaac/states/base.go @@ -4,11 +4,11 @@ import ( "context" "fmt" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) type baseHandler struct { diff --git a/isaac/states/base_ballot_handler.go b/isaac/states/base_ballot_handler.go index d2fd6773..5a2a59b0 100644 --- a/isaac/states/base_ballot_handler.go +++ b/isaac/states/base_ballot_handler.go @@ -4,11 +4,11 @@ import ( "context" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" ) type SuffrageVotingFindFunc func(context.Context, base.Height, base.Suffrage) ([]base.SuffrageExpelOperation, error) diff --git a/isaac/states/booting.go b/isaac/states/booting.go index 302f0c22..1183735c 100644 --- a/isaac/states/booting.go +++ b/isaac/states/booting.go @@ -1,11 +1,11 @@ package isaacstates import ( + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" ) type BootingHandlerArgs struct { diff --git a/isaac/states/booting_test.go b/isaac/states/booting_test.go index 88a60793..c688b52f 100644 --- a/isaac/states/booting_test.go +++ b/isaac/states/booting_test.go @@ -3,9 +3,9 @@ package isaacstates import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/broadcast.go b/isaac/states/broadcast.go index 3989bd9c..0fd2a02e 100644 --- a/isaac/states/broadcast.go +++ b/isaac/states/broadcast.go @@ -7,10 +7,10 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" ) var ( diff --git a/isaac/states/broadcast_test.go b/isaac/states/broadcast_test.go index 45914b9c..de515c40 100644 --- a/isaac/states/broadcast_test.go +++ b/isaac/states/broadcast_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" "go.uber.org/goleak" "golang.org/x/exp/slices" diff --git a/isaac/states/broken.go b/isaac/states/broken.go index a0f5b6f5..fef55f70 100644 --- a/isaac/states/broken.go +++ b/isaac/states/broken.go @@ -1,9 +1,9 @@ package isaacstates import ( + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" ) var ErrUnpromising = util.NewIDError("unpromising broken error") diff --git a/isaac/states/consensus.go b/isaac/states/consensus.go index 636841f2..fe404c4b 100644 --- a/isaac/states/consensus.go +++ b/isaac/states/consensus.go @@ -3,10 +3,10 @@ package isaacstates import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" ) type ConsensusHandlerArgs struct { diff --git a/isaac/states/consensus_new_accept_voteproof_test.go b/isaac/states/consensus_new_accept_voteproof_test.go index 65e5386c..c888dba3 100644 --- a/isaac/states/consensus_new_accept_voteproof_test.go +++ b/isaac/states/consensus_new_accept_voteproof_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/consensus_new_expel_voteproof_test.go b/isaac/states/consensus_new_expel_voteproof_test.go index d5ae1423..85095c8d 100644 --- a/isaac/states/consensus_new_expel_voteproof_test.go +++ b/isaac/states/consensus_new_expel_voteproof_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" "golang.org/x/exp/slices" ) diff --git a/isaac/states/consensus_new_init_voteproof_test.go b/isaac/states/consensus_new_init_voteproof_test.go index 0bac3478..46d4ea1e 100644 --- a/isaac/states/consensus_new_init_voteproof_test.go +++ b/isaac/states/consensus_new_init_voteproof_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/consensus_test.go b/isaac/states/consensus_test.go index 460fe68e..cbc50fde 100644 --- a/isaac/states/consensus_test.go +++ b/isaac/states/consensus_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/handler.go b/isaac/states/handler.go index 36320cc6..22b6cafc 100644 --- a/isaac/states/handler.go +++ b/isaac/states/handler.go @@ -3,10 +3,10 @@ package isaacstates import ( "fmt" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" ) type StateType string diff --git a/isaac/states/handover.go b/isaac/states/handover.go index 46a80f26..f0b9e2aa 100644 --- a/isaac/states/handover.go +++ b/isaac/states/handover.go @@ -3,10 +3,10 @@ package isaacstates import ( "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" ) type HandoverHandlerArgs struct { diff --git a/isaac/states/handover_message.go b/isaac/states/handover_message.go index 8f08c1a8..90a95455 100644 --- a/isaac/states/handover_message.go +++ b/isaac/states/handover_message.go @@ -1,9 +1,9 @@ package isaacstates import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) type HandoverMessageDataType string diff --git a/isaac/states/handover_message_json.go b/isaac/states/handover_message_json.go index a766a529..471257fa 100644 --- a/isaac/states/handover_message_json.go +++ b/isaac/states/handover_message_json.go @@ -4,11 +4,11 @@ import ( "encoding/json" "fmt" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" ) type baseHandoverMessageJSONMarshaler struct { diff --git a/isaac/states/handover_message_json_test.go b/isaac/states/handover_message_json_test.go index 6e4a9ae8..79b97e38 100644 --- a/isaac/states/handover_message_json_test.go +++ b/isaac/states/handover_message_json_test.go @@ -4,14 +4,14 @@ import ( "fmt" "testing" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/handover_test.go b/isaac/states/handover_test.go index cc159f4f..e1b69ac6 100644 --- a/isaac/states/handover_test.go +++ b/isaac/states/handover_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/handover_x.go b/isaac/states/handover_x.go index b1220f0f..82f2a5a7 100644 --- a/isaac/states/handover_x.go +++ b/isaac/states/handover_x.go @@ -5,12 +5,12 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) var ( diff --git a/isaac/states/handover_x_test.go b/isaac/states/handover_x_test.go index e7c9184e..d0072df9 100644 --- a/isaac/states/handover_x_test.go +++ b/isaac/states/handover_x_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/handover_xy_test.go b/isaac/states/handover_xy_test.go index aecf53ca..751315e6 100644 --- a/isaac/states/handover_xy_test.go +++ b/isaac/states/handover_xy_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/handover_y.go b/isaac/states/handover_y.go index a93fe22c..050903aa 100644 --- a/isaac/states/handover_y.go +++ b/isaac/states/handover_y.go @@ -5,12 +5,12 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) type HandoverYBrokerArgs struct { diff --git a/isaac/states/handover_y_test.go b/isaac/states/handover_y_test.go index 88f3774a..ca3a4363 100644 --- a/isaac/states/handover_y_test.go +++ b/isaac/states/handover_y_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/joining.go b/isaac/states/joining.go index d310bf93..754a65ce 100644 --- a/isaac/states/joining.go +++ b/isaac/states/joining.go @@ -5,11 +5,11 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" ) type JoiningHandlerArgs struct { diff --git a/isaac/states/joining_test.go b/isaac/states/joining_test.go index 7a6b4598..6f174d49 100644 --- a/isaac/states/joining_test.go +++ b/isaac/states/joining_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/last_consensus_nodes_watcher_test.go b/isaac/states/last_consensus_nodes_watcher_test.go index a6e634ae..3780d3bc 100644 --- a/isaac/states/last_consensus_nodes_watcher_test.go +++ b/isaac/states/last_consensus_nodes_watcher_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/isaac/states/states.go b/isaac/states/states.go index 3f13b8da..bb511312 100644 --- a/isaac/states/states.go +++ b/isaac/states/states.go @@ -5,13 +5,13 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" "golang.org/x/exp/slices" ) diff --git a/isaac/states/states_handover.go b/isaac/states/states_handover.go index ff1e1ea4..e1c0ab0b 100644 --- a/isaac/states/states_handover.go +++ b/isaac/states/states_handover.go @@ -4,11 +4,11 @@ import ( "context" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" ) type ( diff --git a/isaac/states/states_handover_test.go b/isaac/states/states_handover_test.go index 7e269661..88a23d6a 100644 --- a/isaac/states/states_handover_test.go +++ b/isaac/states/states_handover_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/states_test.go b/isaac/states/states_test.go index 95fd5d6b..0ae08601 100644 --- a/isaac/states/states_test.go +++ b/isaac/states/states_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/stopped.go b/isaac/states/stopped.go index 44dd7bc3..882ed430 100644 --- a/isaac/states/stopped.go +++ b/isaac/states/stopped.go @@ -1,7 +1,7 @@ package isaacstates import ( - "github.com/spikeekips/mitum/base" + "github.com/ProtoconNet/mitum2/base" ) type StoppedHandler struct { diff --git a/isaac/states/suffrage_builder_test.go b/isaac/states/suffrage_builder_test.go index c11437d7..ceb9b195 100644 --- a/isaac/states/suffrage_builder_test.go +++ b/isaac/states/suffrage_builder_test.go @@ -5,14 +5,14 @@ import ( "sort" "testing" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/syncer.go b/isaac/states/syncer.go index 2ad98db5..43f68e73 100644 --- a/isaac/states/syncer.go +++ b/isaac/states/syncer.go @@ -6,13 +6,13 @@ import ( "sync/atomic" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) type ( diff --git a/isaac/states/syncer_test.go b/isaac/states/syncer_test.go index 44f744ba..02955617 100644 --- a/isaac/states/syncer_test.go +++ b/isaac/states/syncer_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/isaac/states/syncing.go b/isaac/states/syncing.go index ac887684..09359c5e 100644 --- a/isaac/states/syncing.go +++ b/isaac/states/syncing.go @@ -5,13 +5,13 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) type SyncingHandlerArgs struct { diff --git a/isaac/states/syncing_test.go b/isaac/states/syncing_test.go index 920d630b..9474a8c2 100644 --- a/isaac/states/syncing_test.go +++ b/isaac/states/syncing_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" "github.com/stretchr/testify/suite" ) diff --git a/isaac/states/test_ballot.go b/isaac/states/test_ballot.go index f1d06c2b..d90e2091 100644 --- a/isaac/states/test_ballot.go +++ b/isaac/states/test_ballot.go @@ -4,9 +4,9 @@ package isaacstates import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" ) type DummyBallotPool struct { diff --git a/isaac/states/tests.go b/isaac/states/tests.go index ae30819d..b1562760 100644 --- a/isaac/states/tests.go +++ b/isaac/states/tests.go @@ -4,10 +4,10 @@ package isaacstates import ( - "github.com/spikeekips/mitum/base" - isaacblock "github.com/spikeekips/mitum/isaac/block" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" ) func newTestBlockMap( diff --git a/isaac/states/voteproof_handler.go b/isaac/states/voteproof_handler.go index 3c7e955f..c0c60c2d 100644 --- a/isaac/states/voteproof_handler.go +++ b/isaac/states/voteproof_handler.go @@ -5,12 +5,12 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" ) type voteproofHandlerArgs struct { diff --git a/isaac/suffrage.go b/isaac/suffrage.go index 95fe5dd6..135d218c 100644 --- a/isaac/suffrage.go +++ b/isaac/suffrage.go @@ -1,9 +1,9 @@ package isaac import ( + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" ) type Suffrage struct { diff --git a/isaac/suffrage_builder.go b/isaac/suffrage_builder.go index 75e439ce..01cbdd62 100644 --- a/isaac/suffrage_builder.go +++ b/isaac/suffrage_builder.go @@ -4,9 +4,9 @@ import ( "context" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" ) type ( diff --git a/isaac/suffrage_json.go b/isaac/suffrage_json.go index a4970ee1..c5e58400 100644 --- a/isaac/suffrage_json.go +++ b/isaac/suffrage_json.go @@ -3,10 +3,10 @@ package isaac import ( "encoding/json" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" ) func (suf Suffrage) MarshalJSON() ([]byte, error) { diff --git a/isaac/suffrage_limiter.go b/isaac/suffrage_limiter.go index 0119fa94..d346a2ee 100644 --- a/isaac/suffrage_limiter.go +++ b/isaac/suffrage_limiter.go @@ -3,10 +3,10 @@ package isaac import ( "math" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) var ( diff --git a/isaac/suffrage_limiter_json.go b/isaac/suffrage_limiter_json.go index 25ad225f..f6b0009a 100644 --- a/isaac/suffrage_limiter_json.go +++ b/isaac/suffrage_limiter_json.go @@ -1,9 +1,9 @@ package isaac import ( + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) type fixedSuffrageCandidateLimiterRuleJSONMarshaler struct { diff --git a/isaac/suffrage_limiter_test.go b/isaac/suffrage_limiter_test.go index 016c2639..ccfb13b0 100644 --- a/isaac/suffrage_limiter_test.go +++ b/isaac/suffrage_limiter_test.go @@ -3,10 +3,10 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/isaac/suffrage_operation.go b/isaac/suffrage_operation.go index fc084aa5..bcbebec2 100644 --- a/isaac/suffrage_operation.go +++ b/isaac/suffrage_operation.go @@ -4,11 +4,11 @@ import ( "bytes" "strings" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" ) var ( diff --git a/isaac/suffrage_operation_json.go b/isaac/suffrage_operation_json.go index 58e40141..8d2b572d 100644 --- a/isaac/suffrage_operation_json.go +++ b/isaac/suffrage_operation_json.go @@ -1,9 +1,9 @@ package isaac import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" ) type suffrageExpelFactJSONMarshaler struct { diff --git a/isaac/suffrage_operation_test.go b/isaac/suffrage_operation_test.go index a40fc2b6..4cbd95b0 100644 --- a/isaac/suffrage_operation_test.go +++ b/isaac/suffrage_operation_test.go @@ -4,11 +4,11 @@ import ( "strings" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/suffrage_state.go b/isaac/suffrage_state.go index 26d98293..902d0342 100644 --- a/isaac/suffrage_state.go +++ b/isaac/suffrage_state.go @@ -1,10 +1,10 @@ package isaac import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) var ( diff --git a/isaac/suffrage_state_test.go b/isaac/suffrage_state_test.go index 2a0710a9..59f8e3f7 100644 --- a/isaac/suffrage_state_test.go +++ b/isaac/suffrage_state_test.go @@ -3,10 +3,10 @@ package isaac import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" ) diff --git a/isaac/suffrage_voting.go b/isaac/suffrage_voting.go index 0cf1036d..47d8cb5d 100644 --- a/isaac/suffrage_voting.go +++ b/isaac/suffrage_voting.go @@ -8,8 +8,8 @@ import ( "strings" "sync" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "golang.org/x/exp/slices" ) diff --git a/isaac/suffrage_voting_test.go b/isaac/suffrage_voting_test.go index 88e2a207..b84e5c00 100644 --- a/isaac/suffrage_voting_test.go +++ b/isaac/suffrage_voting_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" "golang.org/x/exp/slices" ) diff --git a/isaac/syncer.go b/isaac/syncer.go index ae1647fc..25d8512f 100644 --- a/isaac/syncer.go +++ b/isaac/syncer.go @@ -7,10 +7,10 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" "golang.org/x/exp/slices" ) diff --git a/isaac/syncer_test.go b/isaac/syncer_test.go index aa7a0cbb..832ea08f 100644 --- a/isaac/syncer_test.go +++ b/isaac/syncer_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" "github.com/quic-go/quic-go" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" "github.com/stretchr/testify/suite" "golang.org/x/exp/slices" ) diff --git a/isaac/test_ballot.go b/isaac/test_ballot.go index 42af1d91..9e98b6c6 100644 --- a/isaac/test_ballot.go +++ b/isaac/test_ballot.go @@ -4,9 +4,9 @@ package isaac import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/isaac/test_operation.go b/isaac/test_operation.go index 031207a2..75be0a0d 100644 --- a/isaac/test_operation.go +++ b/isaac/test_operation.go @@ -7,12 +7,12 @@ import ( "context" "encoding/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" ) var ( diff --git a/isaac/test_proposal.go b/isaac/test_proposal.go index 3ba1cede..aaccff81 100644 --- a/isaac/test_proposal.go +++ b/isaac/test_proposal.go @@ -6,9 +6,9 @@ package isaac import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" ) func (pps *ProposalProcessors) SetMakeNew(f func(proposal base.ProposalSignFact, previous base.Manifest) (ProposalProcessor, error)) { diff --git a/isaac/test_readers.go b/isaac/test_readers.go index fa8abd78..6a3ff768 100644 --- a/isaac/test_readers.go +++ b/isaac/test_readers.go @@ -6,8 +6,8 @@ package isaac import ( "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" ) func (rs *BlockItemReaders) EmptyHeightsLock() util.LockedMap[base.Height, time.Time] { diff --git a/isaac/test_suffrage.go b/isaac/test_suffrage.go index 4f8f0441..59abe50e 100644 --- a/isaac/test_suffrage.go +++ b/isaac/test_suffrage.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - "github.com/spikeekips/mitum/base" + "github.com/ProtoconNet/mitum2/base" ) func (suf Suffrage) Locals() []base.LocalNode { diff --git a/isaac/test_voteproof.go b/isaac/test_voteproof.go index 0e591fed..f7b3e089 100644 --- a/isaac/test_voteproof.go +++ b/isaac/test_voteproof.go @@ -6,8 +6,8 @@ package isaac import ( "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util/localtime" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util/localtime" "github.com/stretchr/testify/assert" ) diff --git a/isaac/voteproof.go b/isaac/voteproof.go index a7f1c87d..d3caa914 100644 --- a/isaac/voteproof.go +++ b/isaac/voteproof.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" "golang.org/x/exp/slices" ) diff --git a/isaac/voteproof_isvalid.go b/isaac/voteproof_isvalid.go index 8fae33ea..3e59ee0b 100644 --- a/isaac/voteproof_isvalid.go +++ b/isaac/voteproof_isvalid.go @@ -1,8 +1,8 @@ package isaac import ( - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" ) func IsValidVoteproofWithSuffrage(vp base.Voteproof, suf base.Suffrage) error { diff --git a/isaac/voteproof_json.go b/isaac/voteproof_json.go index 500a179c..18654b23 100644 --- a/isaac/voteproof_json.go +++ b/isaac/voteproof_json.go @@ -4,13 +4,13 @@ import ( "encoding/json" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/valuehash" ) type baseVoteproofJSONMarshaler struct { diff --git a/isaac/voteproof_test.go b/isaac/voteproof_test.go index e2534794..afabbcb4 100644 --- a/isaac/voteproof_test.go +++ b/isaac/voteproof_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/launch/acl.go b/launch/acl.go index eafbf8cb..8db64e0d 100644 --- a/launch/acl.go +++ b/launch/acl.go @@ -7,14 +7,14 @@ import ( "strings" "sync" + "github.com/ProtoconNet/mitum2/base" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" ) type ( diff --git a/launch/acl_test.go b/launch/acl_test.go index 5bd78dad..8577063f 100644 --- a/launch/acl_test.go +++ b/launch/acl_test.go @@ -3,10 +3,10 @@ package launch import ( "testing" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" "gopkg.in/yaml.v3" ) diff --git a/launch/block.go b/launch/block.go index c1a002b1..c1332e9c 100644 --- a/launch/block.go +++ b/launch/block.go @@ -6,12 +6,12 @@ import ( "net/url" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" ) func ImportBlocks( diff --git a/launch/cmd/base.go b/launch/cmd/base.go index 588b3813..0b28efde 100644 --- a/launch/cmd/base.go +++ b/launch/cmd/base.go @@ -3,12 +3,12 @@ package launchcmd import ( "context" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) type BaseCommand struct { diff --git a/launch/cmd/clean.go b/launch/cmd/clean.go index 5ba83edc..0db89779 100644 --- a/launch/cmd/clean.go +++ b/launch/cmd/clean.go @@ -3,11 +3,11 @@ package launchcmd import ( "context" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) type CleanCommand struct { //nolint:govet //... diff --git a/launch/cmd/database_extract.go b/launch/cmd/database_extract.go index 9b187c2e..b481f2e0 100644 --- a/launch/cmd/database_extract.go +++ b/launch/cmd/database_extract.go @@ -13,16 +13,16 @@ import ( "strings" "time" + "github.com/ProtoconNet/mitum2/base" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + "github.com/ProtoconNet/mitum2/launch" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - "github.com/spikeekips/mitum/launch" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" - "github.com/spikeekips/mitum/util/valuehash" leveldbStorage "github.com/syndtr/goleveldb/leveldb/storage" ) diff --git a/launch/cmd/dev_blocks.go b/launch/cmd/dev_blocks.go index 5f5b2a96..ff2a6f7b 100644 --- a/launch/cmd/dev_blocks.go +++ b/launch/cmd/dev_blocks.go @@ -6,15 +6,15 @@ import ( "runtime/pprof" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) type GenerateBlocksCommand struct { //nolint:govet //... diff --git a/launch/cmd/handover.go b/launch/cmd/handover.go index ff7e6cc6..c3e4752b 100644 --- a/launch/cmd/handover.go +++ b/launch/cmd/handover.go @@ -3,10 +3,10 @@ package launchcmd import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/network/quicstream" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/network/quicstream" ) type HandoverCommands struct { diff --git a/launch/cmd/import.go b/launch/cmd/import.go index bd2f086a..16a36e17 100644 --- a/launch/cmd/import.go +++ b/launch/cmd/import.go @@ -8,17 +8,17 @@ import ( "os" "path/filepath" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" - "github.com/spikeekips/mitum/util/valuehash" ) var ( diff --git a/launch/cmd/init.go b/launch/cmd/init.go index 9a4c9542..44473de4 100644 --- a/launch/cmd/init.go +++ b/launch/cmd/init.go @@ -3,9 +3,9 @@ package launchcmd import ( "context" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" ) type INITCommand struct { diff --git a/launch/cmd/key.go b/launch/cmd/key.go index 294f640b..8f4f862c 100644 --- a/launch/cmd/key.go +++ b/launch/cmd/key.go @@ -9,11 +9,11 @@ import ( "reflect" "strings" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) type KeyNewCommand struct { diff --git a/launch/cmd/network.go b/launch/cmd/network.go index 6970b0bb..30ba6afd 100644 --- a/launch/cmd/network.go +++ b/launch/cmd/network.go @@ -6,13 +6,13 @@ import ( "io" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) type NetworkCommand struct { diff --git a/launch/cmd/network_block_item_file.go b/launch/cmd/network_block_item_file.go index f7b5c0a3..0a2796d7 100644 --- a/launch/cmd/network_block_item_file.go +++ b/launch/cmd/network_block_item_file.go @@ -8,14 +8,14 @@ import ( "os" "path/filepath" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/alecthomas/kong" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" ) type NetworkClientBlockItemFilesCommand struct { //nolint:govet //... diff --git a/launch/cmd/network_client_event.go b/launch/cmd/network_client_event.go index 8761e529..b20b18b9 100644 --- a/launch/cmd/network_client_event.go +++ b/launch/cmd/network_client_event.go @@ -7,10 +7,10 @@ import ( "os" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" ) type NetworkClientEventLoggingCommand struct { //nolint:govet //... diff --git a/launch/cmd/network_client_node_info.go b/launch/cmd/network_client_node_info.go index c2e1960b..7c36741e 100644 --- a/launch/cmd/network_client_node_info.go +++ b/launch/cmd/network_client_node_info.go @@ -4,10 +4,10 @@ import ( "context" "os" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util/encoder" ) type NetworkClientNodeInfoCommand struct { //nolint:govet //... diff --git a/launch/cmd/network_client_rw_node.go b/launch/cmd/network_client_rw_node.go index a8b673e0..c4da3d2e 100644 --- a/launch/cmd/network_client_rw_node.go +++ b/launch/cmd/network_client_rw_node.go @@ -7,10 +7,10 @@ import ( "os" "strings" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" "golang.org/x/exp/slices" "gopkg.in/yaml.v3" ) diff --git a/launch/cmd/network_last_blockmap.go b/launch/cmd/network_last_blockmap.go index 3976a7fe..f7968c8a 100644 --- a/launch/cmd/network_last_blockmap.go +++ b/launch/cmd/network_last_blockmap.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" ) type NetworkClientLastBlockMapCommand struct { //nolint:govet //... @@ -26,12 +26,7 @@ func (cmd *NetworkClientLastBlockMapCommand) Run(pctx context.Context) error { var h util.Hash if len(strings.TrimSpace(cmd.Hash)) > 0 { - switch i, err := valuehash.NewBytesFromString(cmd.Hash); { - case err != nil: - return err - default: - h = i - } + h = valuehash.NewBytesFromString(cmd.Hash) } ctx, cancel := context.WithTimeout(pctx, cmd.Timeout) diff --git a/launch/cmd/network_send_operation.go b/launch/cmd/network_send_operation.go index 465c9a22..6762334b 100644 --- a/launch/cmd/network_send_operation.go +++ b/launch/cmd/network_send_operation.go @@ -3,10 +3,10 @@ package launchcmd import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util/encoder" ) type NetworkClientSendOperationCommand struct { //nolint:govet //... diff --git a/launch/cmd/network_state.go b/launch/cmd/network_state.go index 071d64b7..63de08df 100644 --- a/launch/cmd/network_state.go +++ b/launch/cmd/network_state.go @@ -5,9 +5,9 @@ import ( "os" "strings" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" ) type NetworkClientStateCommand struct { //nolint:govet //... @@ -32,12 +32,7 @@ func (cmd *NetworkClientStateCommand) Run(pctx context.Context) error { var h util.Hash if len(strings.TrimSpace(cmd.Hash)) > 0 { - switch i, err := valuehash.NewBytesFromString(cmd.Hash); { - case err != nil: - return err - default: - h = i - } + h = valuehash.NewBytesFromString(cmd.Hash) } ctx, cancel := context.WithTimeout(pctx, cmd.Timeout) diff --git a/launch/cmd/run.go b/launch/cmd/run.go index 9eaef2bc..17ced4ae 100644 --- a/launch/cmd/run.go +++ b/launch/cmd/run.go @@ -8,17 +8,17 @@ import ( "os/signal" "syscall" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/arl/statsviz" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) type RunCommand struct { //nolint:govet //... diff --git a/launch/cmd/storage_status.go b/launch/cmd/storage_status.go index c6ca5dc8..6df60140 100644 --- a/launch/cmd/storage_status.go +++ b/launch/cmd/storage_status.go @@ -5,15 +5,15 @@ import ( "os" "path/filepath" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var PNameStorageStatus = ps.Name("storage-status") diff --git a/launch/cmd/validate_blocks.go b/launch/cmd/validate_blocks.go index 9cb1781a..9a56069a 100644 --- a/launch/cmd/validate_blocks.go +++ b/launch/cmd/validate_blocks.go @@ -3,16 +3,16 @@ package launchcmd import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + "github.com/ProtoconNet/mitum2/launch" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - "github.com/spikeekips/mitum/launch" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var PNameValidateBlocks = ps.Name("validate-blocks") diff --git a/launch/design.go b/launch/design.go index eea7f346..688d03d3 100644 --- a/launch/design.go +++ b/launch/design.go @@ -14,16 +14,16 @@ import ( "strings" "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" consulapi "github.com/hashicorp/consul/api" vault "github.com/hashicorp/vault/api" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" "gopkg.in/yaml.v3" ) diff --git a/launch/design_test.go b/launch/design_test.go index 19e4dfbf..30235a5b 100644 --- a/launch/design_test.go +++ b/launch/design_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - isaacoperation "github.com/spikeekips/mitum/isaac/operation" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + isaacoperation "github.com/ProtoconNet/mitum2/isaac/operation" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "gopkg.in/yaml.v3" diff --git a/launch/event.go b/launch/event.go index 9f8f4800..a10bb439 100644 --- a/launch/event.go +++ b/launch/event.go @@ -8,21 +8,21 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/storage" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/ps" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/storage" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/ps" - "github.com/spikeekips/mitum/util/valuehash" leveldbOpt "github.com/syndtr/goleveldb/leveldb/opt" leveldbStorage "github.com/syndtr/goleveldb/leveldb/storage" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" diff --git a/launch/event_test.go b/launch/event_test.go index 1f9b43e0..68ff0dc8 100644 --- a/launch/event_test.go +++ b/launch/event_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/launch/flags.go b/launch/flags.go index 7e945b98..351b6898 100644 --- a/launch/flags.go +++ b/launch/flags.go @@ -9,12 +9,12 @@ import ( "strings" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" ) type BaseFlags struct { diff --git a/launch/genesis.go b/launch/genesis.go index 39f7400d..99c50eaa 100644 --- a/launch/genesis.go +++ b/launch/genesis.go @@ -4,15 +4,15 @@ import ( "context" "math" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacoperation "github.com/ProtoconNet/mitum2/isaac/operation" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacoperation "github.com/spikeekips/mitum/isaac/operation" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/logging" ) type GenesisBlockGenerator struct { diff --git a/launch/handover.go b/launch/handover.go index 29d87e57..b2b66e13 100644 --- a/launch/handover.go +++ b/launch/handover.go @@ -4,18 +4,18 @@ import ( "context" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var PNameHandoverNetworkHandlers = ps.Name("handover-network-handlers") diff --git a/launch/hinters.go b/launch/hinters.go index 778d3f38..57e53ea2 100644 --- a/launch/hinters.go +++ b/launch/hinters.go @@ -1,18 +1,18 @@ package launch import ( + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + isaacoperation "github.com/ProtoconNet/mitum2/isaac/operation" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/fixedtree" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - isaacoperation "github.com/spikeekips/mitum/isaac/operation" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicmemberlist" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/fixedtree" - "github.com/spikeekips/mitum/util/hint" ) var Hinters = []encoder.DecodeDetail{ diff --git a/launch/info.go b/launch/info.go index befa595d..cf74e878 100644 --- a/launch/info.go +++ b/launch/info.go @@ -5,11 +5,11 @@ import ( "path/filepath" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" ) var ( diff --git a/launch/local_params.go b/launch/local_params.go index 6985a4bb..589713ab 100644 --- a/launch/local_params.go +++ b/launch/local_params.go @@ -3,13 +3,13 @@ package launch import ( "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" ) var ( diff --git a/launch/local_params_marshal.go b/launch/local_params_marshal.go index 4e599974..9d0f2dbb 100644 --- a/launch/local_params_marshal.go +++ b/launch/local_params_marshal.go @@ -4,12 +4,12 @@ import ( "reflect" "time" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" "gopkg.in/yaml.v3" ) diff --git a/launch/logging.go b/launch/logging.go index f3c8d422..24f7b158 100644 --- a/launch/logging.go +++ b/launch/logging.go @@ -5,10 +5,10 @@ import ( "os" "time" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) func init() { //nolint:gochecknoinits //... diff --git a/launch/p_acl.go b/launch/p_acl.go index f5d7dd53..f9f8a6c5 100644 --- a/launch/p_acl.go +++ b/launch/p_acl.go @@ -3,12 +3,12 @@ package launch import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var ( diff --git a/launch/p_design.go b/launch/p_design.go index c0e27179..08dcc314 100644 --- a/launch/p_design.go +++ b/launch/p_design.go @@ -2,12 +2,11 @@ package launch import ( "context" - - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" ) var ( diff --git a/launch/p_discovery.go b/launch/p_discovery.go index aff4385a..96f96d5d 100644 --- a/launch/p_discovery.go +++ b/launch/p_discovery.go @@ -3,9 +3,9 @@ package launch import ( "context" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/ps" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/ps" ) var ( diff --git a/launch/p_encoder.go b/launch/p_encoder.go index f16b5c98..65cdb3a8 100644 --- a/launch/p_encoder.go +++ b/launch/p_encoder.go @@ -3,10 +3,10 @@ package launch import ( "context" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/ps" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/ps" ) var ( diff --git a/launch/p_genesis.go b/launch/p_genesis.go index db3fe049..6b879159 100644 --- a/launch/p_genesis.go +++ b/launch/p_genesis.go @@ -3,14 +3,14 @@ package launch import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var PNameGenerateGenesis = ps.Name("generate-genesis") diff --git a/launch/p_local.go b/launch/p_local.go index dc5d33e2..b59f491f 100644 --- a/launch/p_local.go +++ b/launch/p_local.go @@ -3,11 +3,11 @@ package launch import ( "context" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" ) var ( diff --git a/launch/p_memberlist.go b/launch/p_memberlist.go index b2e1b2ef..12d7be06 100644 --- a/launch/p_memberlist.go +++ b/launch/p_memberlist.go @@ -4,21 +4,21 @@ import ( "context" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/hashicorp/memberlist" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var ( diff --git a/launch/p_memberlist_test.go b/launch/p_memberlist_test.go index 3d4dc4c0..5f523913 100644 --- a/launch/p_memberlist_test.go +++ b/launch/p_memberlist_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/network/quicstream" "github.com/pkg/errors" - "github.com/spikeekips/mitum/network/quicstream" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/launch/p_network.go b/launch/p_network.go index 27d9d04a..f9e4c233 100644 --- a/launch/p_network.go +++ b/launch/p_network.go @@ -11,15 +11,15 @@ import ( "net" "time" + "github.com/ProtoconNet/mitum2/base" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" "github.com/quic-go/quic-go" - "github.com/spikeekips/mitum/base" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var ( diff --git a/launch/p_network_handlers.go b/launch/p_network_handlers.go index 3d8b4ae3..3002cc02 100644 --- a/launch/p_network_handlers.go +++ b/launch/p_network_handlers.go @@ -6,22 +6,23 @@ import ( "net/url" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - isaacoperation "github.com/spikeekips/mitum/isaac/operation" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + isaacoperation "github.com/ProtoconNet/mitum2/isaac/operation" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" + "github.com/ProtoconNet/mitum2/util/valuehash" + "github.com/pkg/errors" "golang.org/x/exp/slices" ) @@ -325,7 +326,7 @@ func SendOperationFilterFunc(pctx context.Context) ( case !ok: return false, nil case !operationfilterf(hinter.Hint()): - return false, nil + return false, errors.Errorf("Not supported operation") } var height base.Height diff --git a/launch/p_node_rw.go b/launch/p_node_rw.go index 8c550e20..94e5123c 100644 --- a/launch/p_node_rw.go +++ b/launch/p_node_rw.go @@ -14,21 +14,21 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" consulapi "github.com/hashicorp/consul/api" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" "gopkg.in/yaml.v3" ) diff --git a/launch/p_nodeinfo.go b/launch/p_nodeinfo.go index 2452342b..f4f27b1e 100644 --- a/launch/p_nodeinfo.go +++ b/launch/p_nodeinfo.go @@ -3,15 +3,15 @@ package launch import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var ( diff --git a/launch/p_proposal.go b/launch/p_proposal.go index 35aa292f..7f2b97d7 100644 --- a/launch/p_proposal.go +++ b/launch/p_proposal.go @@ -5,17 +5,17 @@ import ( "math" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/logging" ) func PProposalProcessors(pctx context.Context) (context.Context, error) { diff --git a/launch/p_proposal_maker.go b/launch/p_proposal_maker.go index aafe3f37..7e23f9a5 100644 --- a/launch/p_proposal_maker.go +++ b/launch/p_proposal_maker.go @@ -2,16 +2,17 @@ package launch import ( "context" + "github.com/pkg/errors" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - isaacoperation "github.com/spikeekips/mitum/isaac/operation" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + isaacoperation "github.com/ProtoconNet/mitum2/isaac/operation" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" ) var ( @@ -96,7 +97,7 @@ func proposalMakderGetOperationsFunc(pctx context.Context) ( func(meta isaac.PoolOperationRecordMeta) (bool, error) { // NOTE filter genesis operations if !operationfilterf(meta.Hint()) { - return false, nil + return false, errors.Errorf("Not supported operation") } switch found, err := db.ExistsKnownOperation(meta.Operation()); { diff --git a/launch/p_ratelimit.go b/launch/p_ratelimit.go index 280449ec..fd5d011b 100644 --- a/launch/p_ratelimit.go +++ b/launch/p_ratelimit.go @@ -5,14 +5,14 @@ import ( "io" "net" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" "golang.org/x/sync/singleflight" ) diff --git a/launch/p_readers.go b/launch/p_readers.go index 493b69d3..94897dad 100644 --- a/launch/p_readers.go +++ b/launch/p_readers.go @@ -3,12 +3,12 @@ package launch import ( "context" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" ) var ( diff --git a/launch/p_states.go b/launch/p_states.go index 8c01a1af..b57ba02a 100644 --- a/launch/p_states.go +++ b/launch/p_states.go @@ -6,21 +6,21 @@ import ( "net/url" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" - "github.com/spikeekips/mitum/util/valuehash" ) var ( diff --git a/launch/p_states_network_handlers.go b/launch/p_states_network_handlers.go index 066961a1..38acf68e 100644 --- a/launch/p_states_network_handlers.go +++ b/launch/p_states_network_handlers.go @@ -4,19 +4,19 @@ import ( "context" "io" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var PNameStatesNetworkHandlers = ps.Name("states-network-handlers") diff --git a/launch/p_storage.go b/launch/p_storage.go index 2ac17354..df9888d7 100644 --- a/launch/p_storage.go +++ b/launch/p_storage.go @@ -11,19 +11,19 @@ import ( "strings" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacblock "github.com/ProtoconNet/mitum2/isaac/block" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + leveldbstorage "github.com/ProtoconNet/mitum2/storage/leveldb" + redisstorage "github.com/ProtoconNet/mitum2/storage/redis" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" "github.com/redis/go-redis/v9" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacblock "github.com/spikeekips/mitum/isaac/block" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - leveldbstorage "github.com/spikeekips/mitum/storage/leveldb" - redisstorage "github.com/spikeekips/mitum/storage/redis" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" leveldbStorage "github.com/syndtr/goleveldb/leveldb/storage" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/launch/p_suffrage.go b/launch/p_suffrage.go index 94113f1b..75a4f28f 100644 --- a/launch/p_suffrage.go +++ b/launch/p_suffrage.go @@ -4,17 +4,17 @@ import ( "context" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacdatabase "github.com/ProtoconNet/mitum2/isaac/database" + isaacstates "github.com/ProtoconNet/mitum2/isaac/states" + "github.com/ProtoconNet/mitum2/network/quicmemberlist" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacdatabase "github.com/spikeekips/mitum/isaac/database" - isaacstates "github.com/spikeekips/mitum/isaac/states" - "github.com/spikeekips/mitum/network/quicmemberlist" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var ( diff --git a/launch/p_sync.go b/launch/p_sync.go index 4dbdef1c..12f5ba4d 100644 --- a/launch/p_sync.go +++ b/launch/p_sync.go @@ -3,14 +3,14 @@ package launch import ( "context" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var ( diff --git a/launch/p_time_sync.go b/launch/p_time_sync.go index 8a811044..1d041f4c 100644 --- a/launch/p_time_sync.go +++ b/launch/p_time_sync.go @@ -3,10 +3,10 @@ package launch import ( "context" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" ) var ( diff --git a/launch/ps_import.go b/launch/ps_import.go index 5a2b8cbe..4c82a1a0 100644 --- a/launch/ps_import.go +++ b/launch/ps_import.go @@ -1,6 +1,6 @@ package launch -import "github.com/spikeekips/mitum/util/ps" +import "github.com/ProtoconNet/mitum2/util/ps" func DefaultImportPS() *ps.PS { pps := ps.NewPS("cmd-import") diff --git a/launch/ps_init.go b/launch/ps_init.go index 96d6405a..c64639d9 100644 --- a/launch/ps_init.go +++ b/launch/ps_init.go @@ -1,6 +1,6 @@ package launch -import "github.com/spikeekips/mitum/util/ps" +import "github.com/ProtoconNet/mitum2/util/ps" func DefaultINITPS() *ps.PS { pps := ps.NewPS("cmd-init") diff --git a/launch/ps_main.go b/launch/ps_main.go index b1b2500f..e5a72d55 100644 --- a/launch/ps_main.go +++ b/launch/ps_main.go @@ -4,11 +4,11 @@ import ( "context" "strings" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/ps" "github.com/alecthomas/kong" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/ps" ) var ( diff --git a/launch/ps_run.go b/launch/ps_run.go index 3d311767..cdcb3f9d 100644 --- a/launch/ps_run.go +++ b/launch/ps_run.go @@ -1,6 +1,6 @@ package launch -import "github.com/spikeekips/mitum/util/ps" +import "github.com/ProtoconNet/mitum2/util/ps" func DefaultRunPS() *ps.PS { pps := ps.NewPS("cmd-run") diff --git a/launch/ratelimit.go b/launch/ratelimit.go index 0ca24bf7..2d932796 100644 --- a/launch/ratelimit.go +++ b/launch/ratelimit.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/spikeekips/mitum/base" - isaacnetwork "github.com/spikeekips/mitum/isaac/network" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/base" + isaacnetwork "github.com/ProtoconNet/mitum2/isaac/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" "golang.org/x/time/rate" ) diff --git a/launch/ratelimit_json.go b/launch/ratelimit_json.go index 0c127457..556994b3 100644 --- a/launch/ratelimit_json.go +++ b/launch/ratelimit_json.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" "golang.org/x/time/rate" ) diff --git a/launch/ratelimit_json_test.go b/launch/ratelimit_json_test.go index f0531f75..595a8592 100644 --- a/launch/ratelimit_json_test.go +++ b/launch/ratelimit_json_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/stretchr/testify/suite" "golang.org/x/time/rate" ) diff --git a/launch/ratelimit_test.go b/launch/ratelimit_test.go index 9382d0e1..b13064f3 100644 --- a/launch/ratelimit_test.go +++ b/launch/ratelimit_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/isaac" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/isaac" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" "github.com/stretchr/testify/suite" "go.uber.org/goleak" "golang.org/x/time/rate" diff --git a/launch/suffrage.go b/launch/suffrage.go index adc0321d..bd603f64 100644 --- a/launch/suffrage.go +++ b/launch/suffrage.go @@ -4,9 +4,9 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/util" "golang.org/x/sync/singleflight" ) diff --git a/network/conn.go b/network/conn.go index 9c306c38..61216743 100644 --- a/network/conn.go +++ b/network/conn.go @@ -6,8 +6,8 @@ import ( "net/url" "strings" + "github.com/ProtoconNet/mitum2/util" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util" ) type ConnInfo interface { diff --git a/network/quicmemberlist/broadcast.go b/network/quicmemberlist/broadcast.go index 7777f125..6959ef05 100644 --- a/network/quicmemberlist/broadcast.go +++ b/network/quicmemberlist/broadcast.go @@ -3,15 +3,15 @@ package quicmemberlist import ( "sync" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/hashicorp/memberlist" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" ) type Broadcast struct { diff --git a/network/quicmemberlist/conn.go b/network/quicmemberlist/conn.go index 979b3a03..47705287 100644 --- a/network/quicmemberlist/conn.go +++ b/network/quicmemberlist/conn.go @@ -8,10 +8,10 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" ) type NamedAddr struct { diff --git a/network/quicmemberlist/conn_test.go b/network/quicmemberlist/conn_test.go index 38ad5d70..756da2f4 100644 --- a/network/quicmemberlist/conn_test.go +++ b/network/quicmemberlist/conn_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/network/quicmemberlist/delegate.go b/network/quicmemberlist/delegate.go index fa55955d..c3f94f4d 100644 --- a/network/quicmemberlist/delegate.go +++ b/network/quicmemberlist/delegate.go @@ -4,13 +4,13 @@ import ( "net" "time" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/hashicorp/memberlist" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/logging" ) var defaultNodeChallengeExpire = time.Second * 30 diff --git a/network/quicmemberlist/member.go b/network/quicmemberlist/member.go index d3f20d12..010b45d9 100644 --- a/network/quicmemberlist/member.go +++ b/network/quicmemberlist/member.go @@ -5,15 +5,15 @@ import ( "net" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/localtime" "github.com/hashicorp/memberlist" "github.com/pkg/errors" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/localtime" ) var MemberHint = hint.MustNewHint("memberlist-member-v0.0.1") diff --git a/network/quicmemberlist/memberlist.go b/network/quicmemberlist/memberlist.go index c728a684..6f5c8531 100644 --- a/network/quicmemberlist/memberlist.go +++ b/network/quicmemberlist/memberlist.go @@ -13,17 +13,17 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/hashicorp/memberlist" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/localtime" - "github.com/spikeekips/mitum/util/logging" "golang.org/x/exp/slices" "golang.org/x/sync/semaphore" "golang.org/x/sync/singleflight" diff --git a/network/quicmemberlist/memberlist_test.go b/network/quicmemberlist/memberlist_test.go index 712384bf..fca3eaed 100644 --- a/network/quicmemberlist/memberlist_test.go +++ b/network/quicmemberlist/memberlist_test.go @@ -10,16 +10,15 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/base" + "github.com/ProtoconNet/mitum2/network/quicstream" + quicstreamheader "github.com/ProtoconNet/mitum2/network/quicstream/header" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" "github.com/hashicorp/memberlist" "github.com/pkg/errors" "github.com/quic-go/quic-go" - "github.com/spikeekips/mitum/base" - "github.com/spikeekips/mitum/network/quicstream" - quicstreamheader "github.com/spikeekips/mitum/network/quicstream/header" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/logging" "github.com/stretchr/testify/suite" "golang.org/x/exp/slices" ) diff --git a/network/quicmemberlist/transport.go b/network/quicmemberlist/transport.go index ada958cf..64c20924 100644 --- a/network/quicmemberlist/transport.go +++ b/network/quicmemberlist/transport.go @@ -8,12 +8,12 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/hashicorp/memberlist" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) type ( diff --git a/network/quicstream/client.go b/network/quicstream/client.go index b13de17a..68c9b920 100644 --- a/network/quicstream/client.go +++ b/network/quicstream/client.go @@ -7,9 +7,9 @@ import ( "net" "time" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" "github.com/quic-go/quic-go" - "github.com/spikeekips/mitum/util" ) var ErrNetwork = util.NewIDError("network error") diff --git a/network/quicstream/client_test.go b/network/quicstream/client_test.go index b09586b8..9eb79d5b 100644 --- a/network/quicstream/client_test.go +++ b/network/quicstream/client_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" "github.com/quic-go/quic-go" - "github.com/spikeekips/mitum/util" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/network/quicstream/conn.go b/network/quicstream/conn.go index 316ddbe7..33763137 100644 --- a/network/quicstream/conn.go +++ b/network/quicstream/conn.go @@ -3,9 +3,9 @@ package quicstream import ( "net" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/util" ) type ConnInfo struct { diff --git a/network/quicstream/conn_test.go b/network/quicstream/conn_test.go index 18891cc7..8f7b7eec 100644 --- a/network/quicstream/conn_test.go +++ b/network/quicstream/conn_test.go @@ -3,9 +3,9 @@ package quicstream import ( "testing" - "github.com/spikeekips/mitum/network" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" + "github.com/ProtoconNet/mitum2/network" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/stretchr/testify/suite" ) diff --git a/network/quicstream/connection.go b/network/quicstream/connection.go index d2d87db4..22661814 100644 --- a/network/quicstream/connection.go +++ b/network/quicstream/connection.go @@ -7,10 +7,10 @@ import ( "io" "net" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util" ) var ErrOpenStream = util.NewIDError("open stream") diff --git a/network/quicstream/connection_test.go b/network/quicstream/connection_test.go index 69519e96..5403cef0 100644 --- a/network/quicstream/connection_test.go +++ b/network/quicstream/connection_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" "github.com/quic-go/quic-go" - "github.com/spikeekips/mitum/util" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/network/quicstream/handler.go b/network/quicstream/handler.go index 23d3defc..6a160c94 100644 --- a/network/quicstream/handler.go +++ b/network/quicstream/handler.go @@ -7,11 +7,11 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" - "github.com/spikeekips/mitum/util/valuehash" ) type ( diff --git a/network/quicstream/header/broker.go b/network/quicstream/header/broker.go index a93748ad..82ce8a51 100644 --- a/network/quicstream/header/broker.go +++ b/network/quicstream/header/broker.go @@ -6,10 +6,10 @@ import ( "io" "sync" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" ) type ( diff --git a/network/quicstream/header/broker_test.go b/network/quicstream/header/broker_test.go index cd4eb48f..010fab62 100644 --- a/network/quicstream/header/broker_test.go +++ b/network/quicstream/header/broker_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" "github.com/quic-go/quic-go" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/hint" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) @@ -576,7 +576,7 @@ func (t *testBrokers) TestReadBody() { func TestBrokers(t *testing.T) { defer goleak.VerifyNone(t, - goleak.IgnoreTopFunction("github.com/spikeekips/mitum/util.EnsureRead.func1"), + goleak.IgnoreTopFunction("github.com/ProtoconNet/mitum2/util.EnsureRead.func1"), ) suite.Run(t, new(testBrokers)) diff --git a/network/quicstream/header/handler.go b/network/quicstream/header/handler.go index e5697d6e..901b932f 100644 --- a/network/quicstream/header/handler.go +++ b/network/quicstream/header/handler.go @@ -5,10 +5,10 @@ import ( "io" "net" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" "github.com/pkg/errors" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" ) type Handler[T RequestHeader] func( diff --git a/network/quicstream/header/header.go b/network/quicstream/header/header.go index 6db725fd..6eea02e7 100644 --- a/network/quicstream/header/header.go +++ b/network/quicstream/header/header.go @@ -3,10 +3,10 @@ package quicstreamheader import ( "context" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) type ( diff --git a/network/quicstream/header/header_json.go b/network/quicstream/header/header_json.go index 2ae32996..a3295b72 100644 --- a/network/quicstream/header/header_json.go +++ b/network/quicstream/header/header_json.go @@ -3,8 +3,8 @@ package quicstreamheader import ( "fmt" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) type BaseHeaderJSONMarshaler struct { diff --git a/network/quicstream/header/header_json_test.go b/network/quicstream/header/header_json_test.go index 7eb1cc24..5a6ee59e 100644 --- a/network/quicstream/header/header_json_test.go +++ b/network/quicstream/header/header_json_test.go @@ -3,11 +3,11 @@ package quicstreamheader import ( "testing" + "github.com/ProtoconNet/mitum2/network/quicstream" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/network/quicstream" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" "github.com/stretchr/testify/suite" ) diff --git a/network/quicstream/server.go b/network/quicstream/server.go index fa2f2f40..819375d7 100644 --- a/network/quicstream/server.go +++ b/network/quicstream/server.go @@ -6,11 +6,11 @@ import ( "net" "time" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) type Server struct { diff --git a/network/quicstream/tests.go b/network/quicstream/tests.go index 30e71c66..406fbbbe 100644 --- a/network/quicstream/tests.go +++ b/network/quicstream/tests.go @@ -18,8 +18,8 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/quic-go/quic-go" - "github.com/spikeekips/mitum/util/logging" "github.com/stretchr/testify/suite" ) diff --git a/storage/errors.go b/storage/errors.go index ec4f6895..6417b10e 100644 --- a/storage/errors.go +++ b/storage/errors.go @@ -3,7 +3,7 @@ package storage import ( "errors" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) var ( diff --git a/storage/leveldb/db.go b/storage/leveldb/db.go index f8002053..1df3dfb1 100644 --- a/storage/leveldb/db.go +++ b/storage/leveldb/db.go @@ -4,9 +4,9 @@ import ( "bytes" "sync" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" "github.com/syndtr/goleveldb/leveldb" leveldbOpt "github.com/syndtr/goleveldb/leveldb/opt" leveldbStorage "github.com/syndtr/goleveldb/leveldb/storage" diff --git a/storage/leveldb/db_test.go b/storage/leveldb/db_test.go index 4b35b18f..9a546609 100644 --- a/storage/leveldb/db_test.go +++ b/storage/leveldb/db_test.go @@ -6,7 +6,7 @@ import ( "syscall" "testing" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" "github.com/syndtr/goleveldb/leveldb" leveldbStorage "github.com/syndtr/goleveldb/leveldb/storage" diff --git a/storage/leveldb/prefix.go b/storage/leveldb/prefix.go index 2149766f..8a1ead02 100644 --- a/storage/leveldb/prefix.go +++ b/storage/leveldb/prefix.go @@ -3,9 +3,9 @@ package leveldbstorage import ( "sync" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" "github.com/syndtr/goleveldb/leveldb" leveldbOpt "github.com/syndtr/goleveldb/leveldb/opt" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" diff --git a/storage/leveldb/prefix_test.go b/storage/leveldb/prefix_test.go index d2478448..90fdb99a 100644 --- a/storage/leveldb/prefix_test.go +++ b/storage/leveldb/prefix_test.go @@ -5,8 +5,8 @@ import ( "sort" "testing" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" leveldbutil "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/storage/redis/db.go b/storage/redis/db.go index 71df5f37..c98d213e 100644 --- a/storage/redis/db.go +++ b/storage/redis/db.go @@ -4,10 +4,10 @@ import ( "context" "sync" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" "github.com/redis/go-redis/v9" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" ) type Storage struct { diff --git a/storage/redis/db_test.go b/storage/redis/db_test.go index a80df528..06040afa 100644 --- a/storage/redis/db_test.go +++ b/storage/redis/db_test.go @@ -9,10 +9,9 @@ import ( "sort" "testing" - "github.com/alicebob/miniredis/v2" + "github.com/ProtoconNet/mitum2/storage" + "github.com/ProtoconNet/mitum2/util" "github.com/redis/go-redis/v9" - "github.com/spikeekips/mitum/storage" - "github.com/spikeekips/mitum/util" "github.com/stretchr/testify/suite" ) diff --git a/util/checksum.go b/util/checksum.go index f3f9d74c..54b7080e 100644 --- a/util/checksum.go +++ b/util/checksum.go @@ -2,7 +2,7 @@ package util import ( "crypto/sha256" - "encoding/hex" + "fmt" "hash" "io" "sync" @@ -176,5 +176,5 @@ func (r *HashChecksumReader) Checksum() string { } func checksumstring(h hash.Hash) string { - return hex.EncodeToString(h.Sum(nil)) + return fmt.Sprintf("%x", h.Sum(nil)) } diff --git a/util/encoder/encoder.go b/util/encoder/encoder.go index fd945f52..c70be46d 100644 --- a/util/encoder/encoder.go +++ b/util/encoder/encoder.go @@ -3,8 +3,8 @@ package encoder import ( "io" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" ) type Encoder interface { //nolint:interfacebloat //... @@ -20,6 +20,7 @@ type Encoder interface { //nolint:interfacebloat //... DecodeWithHintType([]byte, hint.Type) (interface{}, error) // NOTE decode []byte by given type DecodeWithFixedHintType(string, int) (interface{}, error) // NOTE decode string by fixed type size DecodeSlice([]byte) ([]interface{}, error) // NOTE decode sliced data + DecodeMap([]byte) (map[string]interface{}, error) // NOTE decode map data } type DecodeFunc func([]byte, hint.Hint) (interface{}, error) diff --git a/util/encoder/encoders.go b/util/encoder/encoders.go index 4b9441a1..698ab453 100644 --- a/util/encoder/encoders.go +++ b/util/encoder/encoders.go @@ -1,7 +1,7 @@ package encoder import ( - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util/hint" ) type Encoders struct { diff --git a/util/encoder/json/encoder.go b/util/encoder/json/encoder.go index a35aaa27..fec174d4 100644 --- a/util/encoder/json/encoder.go +++ b/util/encoder/json/encoder.go @@ -6,10 +6,10 @@ import ( "io" "reflect" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" ) var JSONEncoderHint = hint.MustNewHint("json-encoder-v0.0.1") @@ -78,6 +78,7 @@ func (enc *Encoder) Decode(b []byte) (interface{}, error) { } ht, err := enc.guessHint(b) + if err != nil { return nil, err } @@ -184,6 +185,29 @@ func (enc *Encoder) DecodeSlice(b []byte) ([]interface{}, error) { return s, nil } +func (enc *Encoder) DecodeMap(b []byte) (map[string]interface{}, error) { + if len(b) < 1 { + return nil, nil + } + + var r map[string]json.RawMessage + if err := util.UnmarshalJSON(b, &r); err != nil { + return nil, errors.Wrap(err, "failed to decode map") + } + + s := map[string]interface{}{} + for i := range r { + j, err := enc.Decode(r[i]) + if err != nil { + return nil, errors.Wrap(err, "failed to decode map") + } + + s[i] = j + } + + return s, nil +} + func (enc *Encoder) addDecodeDetail(d encoder.DecodeDetail) error { if err := enc.decoders.Add(d.Hint, d); err != nil { return util.ErrInvalid.Wrap(err) diff --git a/util/encoder/json/encoder_test.go b/util/encoder/json/encoder_test.go index 8a0473a9..51507163 100644 --- a/util/encoder/json/encoder_test.go +++ b/util/encoder/json/encoder_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/stretchr/testify/suite" ) diff --git a/util/encoder/json/util.go b/util/encoder/json/util.go index 3df09c70..22ebcff0 100644 --- a/util/encoder/json/util.go +++ b/util/encoder/json/util.go @@ -1,6 +1,6 @@ package jsonenc -import "github.com/spikeekips/mitum/util/encoder" +import "github.com/ProtoconNet/mitum2/util/encoder" type Decodable interface { DecodeJSON([]byte, encoder.Encoder) error diff --git a/util/encoder/tests.go b/util/encoder/tests.go index 43f61747..84a5a032 100644 --- a/util/encoder/tests.go +++ b/util/encoder/tests.go @@ -4,7 +4,7 @@ package encoder import ( - "github.com/spikeekips/mitum/util/hint" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/stretchr/testify/suite" ) diff --git a/util/encoder/util.go b/util/encoder/util.go index 8cc91a81..4d02df6f 100644 --- a/util/encoder/util.go +++ b/util/encoder/util.go @@ -5,9 +5,9 @@ import ( "reflect" "strings" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) var encodersExtensionMap map[hint.Type]string diff --git a/util/fixedtree/node.go b/util/fixedtree/node.go index ad76439d..2d0cd5b2 100644 --- a/util/fixedtree/node.go +++ b/util/fixedtree/node.go @@ -3,9 +3,9 @@ package fixedtree import ( "strings" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" ) var emptyNodeString = "" @@ -38,12 +38,7 @@ func ParseBaseNodeString(s string) (n BaseNode, err error) { case len(l) != 2: return n, e.Errorf("invalid string") case len(l[0]) > 0: - switch i, err := valuehash.NewBytesFromString(l[0]); { - case err != nil: - return n, e.Wrap(err) - default: - n.h = i - } + n.h = valuehash.NewBytesFromString(l[0]) } n.key = l[1] diff --git a/util/fixedtree/node_test.go b/util/fixedtree/node_test.go index b0f9a397..a3e13a4d 100644 --- a/util/fixedtree/node_test.go +++ b/util/fixedtree/node_test.go @@ -3,10 +3,10 @@ package fixedtree import ( "testing" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/util/fixedtree/proof.go b/util/fixedtree/proof.go index f2908810..6e847f43 100644 --- a/util/fixedtree/proof.go +++ b/util/fixedtree/proof.go @@ -1,9 +1,9 @@ package fixedtree import ( + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/valuehash" ) type Proof struct { diff --git a/util/fixedtree/proof_json.go b/util/fixedtree/proof_json.go index 1f704aea..995be38a 100644 --- a/util/fixedtree/proof_json.go +++ b/util/fixedtree/proof_json.go @@ -3,7 +3,7 @@ package fixedtree import ( "encoding/json" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) func (p Proof) MarshalJSON() ([]byte, error) { diff --git a/util/fixedtree/proof_test.go b/util/fixedtree/proof_test.go index 9d5980b6..a8725a1e 100644 --- a/util/fixedtree/proof_test.go +++ b/util/fixedtree/proof_test.go @@ -3,10 +3,10 @@ package fixedtree import ( "testing" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/encoder" - jsonenc "github.com/spikeekips/mitum/util/encoder/json" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/encoder" + jsonenc "github.com/ProtoconNet/mitum2/util/encoder/json" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/util/fixedtree/tree.go b/util/fixedtree/tree.go index db4c1106..0e9b6e7e 100644 --- a/util/fixedtree/tree.go +++ b/util/fixedtree/tree.go @@ -3,10 +3,10 @@ package fixedtree import ( "math" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" ) type Tree struct { diff --git a/util/fixedtree/tree_test.go b/util/fixedtree/tree_test.go index c01cfa59..99589340 100644 --- a/util/fixedtree/tree_test.go +++ b/util/fixedtree/tree_test.go @@ -3,9 +3,9 @@ package fixedtree import ( "testing" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" - "github.com/spikeekips/mitum/util/valuehash" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" + "github.com/ProtoconNet/mitum2/util/valuehash" "github.com/stretchr/testify/suite" ) diff --git a/util/fixedtree/writer.go b/util/fixedtree/writer.go index ed34aee4..88b0f04d 100644 --- a/util/fixedtree/writer.go +++ b/util/fixedtree/writer.go @@ -3,9 +3,9 @@ package fixedtree import ( "sync" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/hint" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/hint" ) var ( diff --git a/util/fixedtree/writer_test.go b/util/fixedtree/writer_test.go index 1a6d27b4..d259a36e 100644 --- a/util/fixedtree/writer_test.go +++ b/util/fixedtree/writer_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/util/hash.go b/util/hash.go index 6b3e3c85..2710de9d 100644 --- a/util/hash.go +++ b/util/hash.go @@ -2,13 +2,13 @@ package util import ( "bytes" - "encoding/hex" "fmt" + "github.com/btcsuite/btcutil/base58" ) type Hash interface { Equal(Hash) bool - fmt.Stringer // NOTE usually String() value is the hex encoded of Bytes() + fmt.Stringer // NOTE usually String() value is the base58 encoded of Bytes() Byter IsValider } @@ -23,11 +23,11 @@ type HashByter interface { } func EncodeHash(b []byte) string { - return hex.EncodeToString(b) + return base58.Encode(b) } -func DecodeHash(s string) ([]byte, error) { - return hex.DecodeString(s) +func DecodeHash(s string) []byte { + return base58.Decode(s) } func IsEqualHashByter(a, b HashByter) bool { diff --git a/util/hint/hint.go b/util/hint/hint.go index ee7d431a..fb5801d9 100644 --- a/util/hint/hint.go +++ b/util/hint/hint.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" ) var ( diff --git a/util/hint/hint_test.go b/util/hint/hint_test.go index 19ec820a..b9044661 100644 --- a/util/hint/hint_test.go +++ b/util/hint/hint_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/util/hint/hinter.go b/util/hint/hinter.go index 157cf843..88cf5fa2 100644 --- a/util/hint/hinter.go +++ b/util/hint/hinter.go @@ -1,8 +1,8 @@ package hint import ( + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" ) type SetHinter interface { diff --git a/util/hint/hinter_test.go b/util/hint/hinter_test.go index 633ac9bb..90e99558 100644 --- a/util/hint/hinter_test.go +++ b/util/hint/hinter_test.go @@ -3,7 +3,7 @@ package hint import ( "testing" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/util/hint/set.go b/util/hint/set.go index 8aa775ef..4312de7c 100644 --- a/util/hint/set.go +++ b/util/hint/set.go @@ -1,8 +1,8 @@ package hint import ( + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" ) type CompatibleSet[T any] struct { diff --git a/util/hint/set_test.go b/util/hint/set_test.go index b80c38ef..eb7fbc68 100644 --- a/util/hint/set_test.go +++ b/util/hint/set_test.go @@ -3,7 +3,7 @@ package hint import ( "testing" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/util/hint/type.go b/util/hint/type.go index f654230b..ab7a0745 100644 --- a/util/hint/type.go +++ b/util/hint/type.go @@ -3,7 +3,7 @@ package hint import ( "regexp" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) var ( diff --git a/util/localtime/time.go b/util/localtime/time.go index d310ede8..8924dd2c 100644 --- a/util/localtime/time.go +++ b/util/localtime/time.go @@ -3,8 +3,8 @@ package localtime import ( "time" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" ) type Time struct { diff --git a/util/localtime/time_sync.go b/util/localtime/time_sync.go index 9b48c71d..245265f7 100644 --- a/util/localtime/time_sync.go +++ b/util/localtime/time_sync.go @@ -5,10 +5,10 @@ import ( "sync" "time" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/beevik/ntp" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" ) var ( diff --git a/util/localtime/time_test.go b/util/localtime/time_test.go index 8fef4381..b76db63f 100644 --- a/util/localtime/time_test.go +++ b/util/localtime/time_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" "go.uber.org/goleak" ) diff --git a/util/ps/ps.go b/util/ps/ps.go index 341bd047..ef46be32 100644 --- a/util/ps/ps.go +++ b/util/ps/ps.go @@ -6,10 +6,10 @@ import ( "strings" "sync" + "github.com/ProtoconNet/mitum2/util" + "github.com/ProtoconNet/mitum2/util/logging" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/spikeekips/mitum/util" - "github.com/spikeekips/mitum/util/logging" "golang.org/x/exp/slices" ) diff --git a/util/ps/ps_test.go b/util/ps/ps_test.go index 78b2283c..5f0932af 100644 --- a/util/ps/ps_test.go +++ b/util/ps/ps_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" "github.com/stretchr/testify/suite" ) diff --git a/util/valuehash/blake3_test.go b/util/valuehash/blake3_test.go index e2d73f90..5ba92796 100644 --- a/util/valuehash/blake3_test.go +++ b/util/valuehash/blake3_test.go @@ -3,7 +3,7 @@ package valuehash import ( "testing" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/util/valuehash/bytes.go b/util/valuehash/bytes.go index d3fbcb30..77355728 100644 --- a/util/valuehash/bytes.go +++ b/util/valuehash/bytes.go @@ -3,8 +3,8 @@ package valuehash import ( "bytes" + "github.com/ProtoconNet/mitum2/util" "github.com/pkg/errors" - "github.com/spikeekips/mitum/util" ) const maxBytesHashSize = 100 @@ -23,13 +23,8 @@ func NewHashFromBytes(b []byte) util.Hash { return NewBytes(b) } -func NewBytesFromString(s string) (Bytes, error) { - switch i, err := util.DecodeHash(s); { - case err != nil: - return nil, err - default: - return NewBytes(i), nil - } +func NewBytesFromString(s string) Bytes { + return NewBytes(util.DecodeHash(s)) } func (h Bytes) String() string { @@ -65,14 +60,9 @@ func (h Bytes) MarshalText() ([]byte, error) { } func (h *Bytes) UnmarshalText(b []byte) error { - switch i, err := NewBytesFromString(string(b)); { - case err != nil: - return err - default: - *h = i + *h = NewBytesFromString(string(b)) - return nil - } + return nil } type HashDecoder struct { diff --git a/util/valuehash/bytes_test.go b/util/valuehash/bytes_test.go index f6d29fb0..9f5c7ceb 100644 --- a/util/valuehash/bytes_test.go +++ b/util/valuehash/bytes_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/util/valuehash/keccak_test.go b/util/valuehash/keccak_test.go index 8fc6a6e6..38c89457 100644 --- a/util/valuehash/keccak_test.go +++ b/util/valuehash/keccak_test.go @@ -3,7 +3,7 @@ package valuehash import ( "testing" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/util/valuehash/static.go b/util/valuehash/static.go index a90ff595..da5bd88e 100644 --- a/util/valuehash/static.go +++ b/util/valuehash/static.go @@ -3,7 +3,7 @@ package valuehash import ( "bytes" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) type ( diff --git a/util/valuehash/static_test.go b/util/valuehash/static_test.go index 360ca985..f7ab3e69 100644 --- a/util/valuehash/static_test.go +++ b/util/valuehash/static_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" "github.com/stretchr/testify/suite" ) diff --git a/util/valuehash/util.go b/util/valuehash/util.go index 2bf075d8..e3335527 100644 --- a/util/valuehash/util.go +++ b/util/valuehash/util.go @@ -3,7 +3,7 @@ package valuehash import ( "crypto/rand" - "github.com/spikeekips/mitum/util" + "github.com/ProtoconNet/mitum2/util" ) func RandomSHA256() util.Hash { From ff4078070a49975d59560eaa428b9953666f8af8 Mon Sep 17 00:00:00 2001 From: soonkuk Date: Mon, 29 Jan 2024 09:43:05 +0900 Subject: [PATCH 2/7] feat: set operation regardless of instate in ProposalProcessor --- go.mod | 44 ++++++------ go.sum | 129 ++++++++++++++---------------------- isaac/proposal_processor.go | 25 +++---- 3 files changed, 81 insertions(+), 117 deletions(-) diff --git a/go.mod b/go.mod index d12d2071..ce9c2451 100644 --- a/go.mod +++ b/go.mod @@ -7,32 +7,32 @@ require ( github.com/alecthomas/kong v0.8.1 github.com/alicebob/miniredis/v2 v2.31.0 github.com/arl/statsviz v0.6.0 - github.com/beevik/ntp v1.3.0 + github.com/beevik/ntp v1.3.1 github.com/bluele/gcache v0.0.2 github.com/btcsuite/btcd/btcec/v2 v2.3.2 - github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 + github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/bytedance/sonic v1.10.2 github.com/gofrs/uuid v4.4.0+incompatible - github.com/hashicorp/consul/api v1.26.1 + github.com/hashicorp/consul/api v1.27.0 github.com/hashicorp/memberlist v0.5.1-0.20230206163934-e5eb6d78d6f2 - github.com/hashicorp/vault/api v1.10.0 + github.com/hashicorp/vault/api v1.11.0 github.com/json-iterator/go v1.1.12 github.com/mattn/go-isatty v0.0.20 github.com/oklog/ulid/v2 v2.1.0 github.com/pkg/errors v0.9.1 - github.com/quic-go/quic-go v0.40.0 - github.com/redis/go-redis/v9 v9.3.0 + github.com/quic-go/quic-go v0.41.0 + github.com/redis/go-redis/v9 v9.4.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/zeebo/blake3 v0.2.3 go.uber.org/goleak v1.3.0 - golang.org/x/crypto v0.17.0 - golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa + golang.org/x/crypto v0.18.0 + golang.org/x/exp v0.0.0-20240119083558-1b970713d09a golang.org/x/mod v0.14.0 - golang.org/x/sync v0.5.0 - golang.org/x/time v0.4.0 + golang.org/x/sync v0.6.0 + golang.org/x/time v0.5.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -47,16 +47,15 @@ require ( github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fatih/color v1.16.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-jose/go-jose/v3 v3.0.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect - github.com/gorilla/websocket v1.5.0 // indirect + github.com/google/pprof v0.0.0-20240125082051-42cd04596328 // indirect + github.com/gorilla/websocket v1.5.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v1.5.0 // indirect + github.com/hashicorp/go-hclog v1.6.2 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -65,32 +64,29 @@ require ( github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect github.com/hashicorp/go-sockaddr v1.0.6 // indirect - github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/serf v0.10.1 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/miekg/dns v1.1.56 // indirect + github.com/miekg/dns v1.1.58 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/onsi/ginkgo v1.16.5 // indirect - github.com/onsi/ginkgo/v2 v2.13.1 // indirect + github.com/onsi/ginkgo/v2 v2.15.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/quic-go/qtls-go1-20 v0.4.1 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect - github.com/stretchr/objx v0.5.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/yuin/gopher-lua v1.1.0 // indirect - go.uber.org/mock v0.3.0 // indirect - golang.org/x/arch v0.6.0 // indirect - golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.15.0 // indirect + go.uber.org/mock v0.4.0 // indirect + golang.org/x/arch v0.7.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.15.0 // indirect + golang.org/x/tools v0.17.0 // indirect google.golang.org/protobuf v1.29.1 // indirect ) diff --git a/go.sum b/go.sum index 1b7f6e0b..013ce57f 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beevik/ntp v1.3.0 h1:/w5VhpW5BGKS37vFm1p9oVk/t4HnnkKZAZIubHM6F7Q= -github.com/beevik/ntp v1.3.0/go.mod h1:vD6h1um4kzXpqmLTuu0cCLcC+NfvC0IC+ltmEDA8E78= +github.com/beevik/ntp v1.3.1 h1:Y/srlT8L1yQr58kyPWFPZIxRL8ttx2SRIpVYJqZIlAM= +github.com/beevik/ntp v1.3.1/go.mod h1:fT6PylBq86Tsq23ZMEe47b7QQrZfYBFPnpzt0a9kJxw= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -40,8 +40,8 @@ github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ= +github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= @@ -90,9 +90,8 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA= github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -137,14 +136,14 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk= -github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/hashicorp/consul/api v1.26.1 h1:5oSXOO5fboPZeW5SN+TdGFP/BILDgBm19OrPZ/pICIM= -github.com/hashicorp/consul/api v1.26.1/go.mod h1:B4sQTeaSO16NtynqrAdwOlahJ7IUDZM9cj2420xYL8A= -github.com/hashicorp/consul/sdk v0.15.0 h1:2qK9nDrr4tiJKRoxPGhm6B7xJjLVIQqkjiab2M4aKjU= -github.com/hashicorp/consul/sdk v0.15.0/go.mod h1:r/OmRRPbHOe0yxNahLw7G9x5WG17E1BIECMtCjcPSNo= +github.com/google/pprof v0.0.0-20240125082051-42cd04596328 h1:oI+lCI2DY1BsRrdzMJBhIMxBBdlZJl31YNQC11EiyvA= +github.com/google/pprof v0.0.0-20240125082051-42cd04596328/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/hashicorp/consul/api v1.27.0 h1:gmJ6DPKQog1426xsdmgk5iqDyoRiNc+ipBdJOqKQFjc= +github.com/hashicorp/consul/api v1.27.0/go.mod h1:JkekNRSou9lANFdt+4IKx3Za7XY0JzzpQjEb4Ivo1c8= +github.com/hashicorp/consul/sdk v0.15.1 h1:kKIGxc7CZtflcF5DLfHeq7rOQmRq3vk7kwISN9bif8Q= +github.com/hashicorp/consul/sdk v0.15.1/go.mod h1:7pxqqhqoaPqnBnzXD1StKed62LqJeClzVsUEy85Zr0A= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -152,8 +151,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I= +github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -181,8 +180,8 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= -github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -192,8 +191,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= -github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ= -github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8= +github.com/hashicorp/vault/api v1.11.0 h1:AChWByeHf4/P9sX3Y1B7vFsQhZO2BgQiCMQ2SA1P1UY= +github.com/hashicorp/vault/api v1.11.0/go.mod h1:si+lJCYO7oGkIoNPAN8j3azBLTn9SjMGS+jFaHd1Cck= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -237,8 +236,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE= -github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY= +github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= +github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -264,13 +263,13 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= -github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= +github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= +github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= +github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -295,12 +294,10 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs= -github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= -github.com/quic-go/quic-go v0.40.0 h1:GYd1iznlKm7dpHD7pOVpUvItgMPo/jrMgDWZhMCecqw= -github.com/quic-go/quic-go v0.40.0/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c= -github.com/redis/go-redis/v9 v9.3.0 h1:RiVDjmig62jIWp7Kk4XVLs0hzV6pI3PyTnnL0cnn0u0= -github.com/redis/go-redis/v9 v9.3.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k= +github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA= +github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= +github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= @@ -318,9 +315,8 @@ github.com/spikeekips/memberlist v0.0.0-20230626195851-39f17fa10d23/go.mod h1:yv github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= -github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -331,7 +327,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= @@ -340,7 +335,6 @@ github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqri github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE= github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY= @@ -351,11 +345,11 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= -go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc= -golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= +golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -364,15 +358,11 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -386,12 +376,8 @@ golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -399,10 +385,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -429,48 +413,31 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= -golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/isaac/proposal_processor.go b/isaac/proposal_processor.go index feacc4dd..543f189b 100644 --- a/isaac/proposal_processor.go +++ b/isaac/proposal_processor.go @@ -498,7 +498,8 @@ func (p *DefaultProposalProcessor) doProcessOperation( f = i } - switch stvs, errorreason, err := f(ctx); { + stvs, errorreason, err := f(ctx) + switch { case err != nil: return err case len(stvs) < 1: @@ -507,19 +508,19 @@ func (p *DefaultProposalProcessor) doProcessOperation( } case errorreason != nil: return e.Errorf("not empty state must have empty reason") - default: - instate := len(stvs) > 0 + } - // NOTE: origin checks instate condition - if err := writer.SetStates(ctx, opsindex, stvs, op); err != nil { - return e.Wrap(err) - } + instate := len(stvs) > 0 - if err := writer.SetProcessResult( - ctx, opsindex, op.Hash(), op.Fact().Hash(), instate, errorreason, - ); err != nil { - return e.Wrap(err) - } + // NOTE: origin checks instate condition + if err := writer.SetStates(ctx, opsindex, stvs, op); err != nil { + return e.Wrap(err) + } + + if err := writer.SetProcessResult( + ctx, opsindex, op.Hash(), op.Fact().Hash(), instate, errorreason, + ); err != nil { + return e.Wrap(err) } return nil From e9221ce8ab9dce4030cfac71cb56ce8126bd6b04 Mon Sep 17 00:00:00 2001 From: soonkuk Date: Tue, 20 Feb 2024 18:36:22 +0900 Subject: [PATCH 3/7] fix: PrivatekeyContextKey value --- launch/cmd/clean.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch/cmd/clean.go b/launch/cmd/clean.go index 0db89779..88e3ef6a 100644 --- a/launch/cmd/clean.go +++ b/launch/cmd/clean.go @@ -52,7 +52,7 @@ func (cmd *CleanCommand) Run(pctx context.Context) error { nctx := util.ContextWithValues(pctx, map[util.ContextKey]interface{}{ launch.DesignFlagContextKey: cmd.DesignFlag, launch.DevFlagsContextKey: cmd.DevFlags, - launch.PrivatekeyContextKey: cmd.PrivatekeyFlags, + launch.PrivatekeyContextKey: string(cmd.PrivatekeyFlags.Flag.Body()), }) cmd.log.Debug().Interface("process", pps.Verbose()).Msg("process ready") From 6f2bcc58496570a8bbcde892d228773dcc173e4a Mon Sep 17 00:00:00 2001 From: soonkuk Date: Mon, 4 Mar 2024 09:31:23 +0900 Subject: [PATCH 4/7] feat: downgrade quic-go from 0.41.0 to 0.39.1 --- go.mod | 44 +++++++++++--------- go.sum | 129 ++++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 105 insertions(+), 68 deletions(-) diff --git a/go.mod b/go.mod index ce9c2451..19fa772c 100644 --- a/go.mod +++ b/go.mod @@ -7,32 +7,32 @@ require ( github.com/alecthomas/kong v0.8.1 github.com/alicebob/miniredis/v2 v2.31.0 github.com/arl/statsviz v0.6.0 - github.com/beevik/ntp v1.3.1 + github.com/beevik/ntp v1.3.0 github.com/bluele/gcache v0.0.2 github.com/btcsuite/btcd/btcec/v2 v2.3.2 - github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 + github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/bytedance/sonic v1.10.2 github.com/gofrs/uuid v4.4.0+incompatible - github.com/hashicorp/consul/api v1.27.0 + github.com/hashicorp/consul/api v1.26.1 github.com/hashicorp/memberlist v0.5.1-0.20230206163934-e5eb6d78d6f2 - github.com/hashicorp/vault/api v1.11.0 + github.com/hashicorp/vault/api v1.10.0 github.com/json-iterator/go v1.1.12 github.com/mattn/go-isatty v0.0.20 github.com/oklog/ulid/v2 v2.1.0 github.com/pkg/errors v0.9.1 - github.com/quic-go/quic-go v0.41.0 - github.com/redis/go-redis/v9 v9.4.0 + github.com/quic-go/quic-go v0.39.1 + github.com/redis/go-redis/v9 v9.3.0 github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/zeebo/blake3 v0.2.3 go.uber.org/goleak v1.3.0 - golang.org/x/crypto v0.18.0 - golang.org/x/exp v0.0.0-20240119083558-1b970713d09a + golang.org/x/crypto v0.17.0 + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa golang.org/x/mod v0.14.0 - golang.org/x/sync v0.6.0 - golang.org/x/time v0.5.0 + golang.org/x/sync v0.5.0 + golang.org/x/time v0.4.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -47,15 +47,16 @@ require ( github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fatih/color v1.16.0 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-jose/go-jose/v3 v3.0.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/pprof v0.0.0-20240125082051-42cd04596328 // indirect - github.com/gorilla/websocket v1.5.1 // indirect + github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect + github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v1.6.2 // indirect + github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -64,29 +65,32 @@ require ( github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect github.com/hashicorp/go-sockaddr v1.0.6 // indirect + github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/serf v0.10.1 // indirect github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/miekg/dns v1.1.58 // indirect + github.com/miekg/dns v1.1.56 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/onsi/ginkgo v1.16.5 // indirect - github.com/onsi/ginkgo/v2 v2.15.0 // indirect + github.com/onsi/ginkgo/v2 v2.13.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/quic-go/qtls-go1-20 v0.3.4 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect + github.com/stretchr/objx v0.5.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/yuin/gopher-lua v1.1.0 // indirect - go.uber.org/mock v0.4.0 // indirect - golang.org/x/arch v0.7.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.16.0 // indirect + go.uber.org/mock v0.3.0 // indirect + golang.org/x/arch v0.6.0 // indirect + golang.org/x/net v0.18.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.15.0 // indirect google.golang.org/protobuf v1.29.1 // indirect ) diff --git a/go.sum b/go.sum index 013ce57f..b5c4d5b2 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beevik/ntp v1.3.1 h1:Y/srlT8L1yQr58kyPWFPZIxRL8ttx2SRIpVYJqZIlAM= -github.com/beevik/ntp v1.3.1/go.mod h1:fT6PylBq86Tsq23ZMEe47b7QQrZfYBFPnpzt0a9kJxw= +github.com/beevik/ntp v1.3.0 h1:/w5VhpW5BGKS37vFm1p9oVk/t4HnnkKZAZIubHM6F7Q= +github.com/beevik/ntp v1.3.0/go.mod h1:vD6h1um4kzXpqmLTuu0cCLcC+NfvC0IC+ltmEDA8E78= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -40,8 +40,8 @@ github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= -github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ= -github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= @@ -90,8 +90,9 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA= github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -136,14 +137,14 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240125082051-42cd04596328 h1:oI+lCI2DY1BsRrdzMJBhIMxBBdlZJl31YNQC11EiyvA= -github.com/google/pprof v0.0.0-20240125082051-42cd04596328/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= -github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= -github.com/hashicorp/consul/api v1.27.0 h1:gmJ6DPKQog1426xsdmgk5iqDyoRiNc+ipBdJOqKQFjc= -github.com/hashicorp/consul/api v1.27.0/go.mod h1:JkekNRSou9lANFdt+4IKx3Za7XY0JzzpQjEb4Ivo1c8= -github.com/hashicorp/consul/sdk v0.15.1 h1:kKIGxc7CZtflcF5DLfHeq7rOQmRq3vk7kwISN9bif8Q= -github.com/hashicorp/consul/sdk v0.15.1/go.mod h1:7pxqqhqoaPqnBnzXD1StKed62LqJeClzVsUEy85Zr0A= +github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk= +github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/hashicorp/consul/api v1.26.1 h1:5oSXOO5fboPZeW5SN+TdGFP/BILDgBm19OrPZ/pICIM= +github.com/hashicorp/consul/api v1.26.1/go.mod h1:B4sQTeaSO16NtynqrAdwOlahJ7IUDZM9cj2420xYL8A= +github.com/hashicorp/consul/sdk v0.15.0 h1:2qK9nDrr4tiJKRoxPGhm6B7xJjLVIQqkjiab2M4aKjU= +github.com/hashicorp/consul/sdk v0.15.0/go.mod h1:r/OmRRPbHOe0yxNahLw7G9x5WG17E1BIECMtCjcPSNo= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -151,8 +152,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I= -github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= +github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -180,8 +181,8 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= -github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= +github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -191,8 +192,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= -github.com/hashicorp/vault/api v1.11.0 h1:AChWByeHf4/P9sX3Y1B7vFsQhZO2BgQiCMQ2SA1P1UY= -github.com/hashicorp/vault/api v1.11.0/go.mod h1:si+lJCYO7oGkIoNPAN8j3azBLTn9SjMGS+jFaHd1Cck= +github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ= +github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -236,8 +237,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= -github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= +github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE= +github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -263,13 +264,13 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= -github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= +github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= +github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= -github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= +github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -294,10 +295,12 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k= -github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA= -github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= -github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg= +github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= +github.com/quic-go/quic-go v0.39.1 h1:d/m3oaN/SD2c+f7/yEjZxe2zEVotXprnrCCJ2y/ZZFE= +github.com/quic-go/quic-go v0.39.1/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= +github.com/redis/go-redis/v9 v9.3.0 h1:RiVDjmig62jIWp7Kk4XVLs0hzV6pI3PyTnnL0cnn0u0= +github.com/redis/go-redis/v9 v9.3.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= @@ -315,8 +318,9 @@ github.com/spikeekips/memberlist v0.0.0-20230626195851-39f17fa10d23/go.mod h1:yv github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= +github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -327,6 +331,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= @@ -335,6 +340,7 @@ github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqri github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE= github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY= @@ -345,11 +351,11 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= -go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= +go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= -golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc= +golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -358,11 +364,15 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= -golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -376,8 +386,12 @@ golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= +golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= +golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -385,8 +399,10 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -413,31 +429,48 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= +golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= +golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 96ca7f16c4a7aba62a1b9ff70aad53cd1f4397a7 Mon Sep 17 00:00:00 2001 From: soonkuk Date: Fri, 15 Mar 2024 08:57:09 +0900 Subject: [PATCH 5/7] feat: udpate NodeInfo DecodeJson --- isaac/network/node_info_json.go | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/isaac/network/node_info_json.go b/isaac/network/node_info_json.go index 868fa9ea..0c460efb 100644 --- a/isaac/network/node_info_json.go +++ b/isaac/network/node_info_json.go @@ -2,7 +2,6 @@ package isaacnetwork import ( "encoding/json" - "github.com/ProtoconNet/mitum2/base" "github.com/ProtoconNet/mitum2/isaac" isaacstates "github.com/ProtoconNet/mitum2/isaac/states" @@ -10,6 +9,8 @@ import ( "github.com/ProtoconNet/mitum2/util/encoder" "github.com/ProtoconNet/mitum2/util/hint" "github.com/ProtoconNet/mitum2/util/localtime" + "github.com/pkg/errors" + "reflect" ) type NodeInfoLocalJSONMarshaler struct { @@ -125,12 +126,25 @@ func (info *NodeInfo) DecodeJSON(b []byte, enc encoder.Encoder) error { info.publickey = i } - params := isaac.NewParams(info.networkID) + //params := isaac.NewParams(info.networkID) + var params *isaac.Params - if err := encoder.Decode(enc, u.Local.LocalParams, params); err != nil { + hinter, err := enc.Decode(u.Local.LocalParams) + if err != nil { return e.Wrap(err) } + if hinter == nil { + return nil + } + + i, ok := hinter.(*isaac.Params) + if !ok { + return errors.Errorf("expected %v, but %T", reflect.TypeOf(params).Elem(), hinter) + } + + params = i + if err := params.SetNetworkID(info.networkID); err != nil { return e.Wrap(err) } From 2604b86de86b7aadf1c82cb6cec1ab80c3868d8e Mon Sep 17 00:00:00 2001 From: soonkuk Date: Tue, 2 Apr 2024 08:29:52 +0900 Subject: [PATCH 6/7] feat: change error message --- base/sign.go | 2 +- util/encoder/json/encoder.go | 14 ++++++++------ util/error.go | 8 ++++---- util/isvalid.go | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/base/sign.go b/base/sign.go index 81882c9a..62417c4f 100644 --- a/base/sign.go +++ b/base/sign.go @@ -87,7 +87,7 @@ func (si BaseSign) IsValid([]byte) error { si.signature, util.DummyIsValider(func([]byte) error { if si.signedAt.IsZero() { - return util.ErrInvalid.Errorf("empty signedAt in BaseSign") + return errors.Errorf("empty signedAt") } return nil diff --git a/util/encoder/json/encoder.go b/util/encoder/json/encoder.go index fec174d4..099bea49 100644 --- a/util/encoder/json/encoder.go +++ b/util/encoder/json/encoder.go @@ -244,8 +244,6 @@ func (*Encoder) guessHint(b []byte) (string, error) { } func (enc *Encoder) analyze(d encoder.DecodeDetail, v interface{}) encoder.DecodeDetail { - e := util.StringError("analyze") - orig := reflect.ValueOf(v) ptr, elem := encoder.Ptr(orig) @@ -263,10 +261,11 @@ func (enc *Encoder) analyze(d encoder.DecodeDetail, v interface{}) encoder.Decod case Decodable: d.Desc = "JSONDecodable" d.Decode = func(b []byte, _ hint.Hint) (interface{}, error) { + e := util.StringError("DecodeJSON") i := reflect.New(elem.Type()).Interface() if err := i.(Decodable).DecodeJSON(b, enc); err != nil { //nolint:forcetypeassert //... - return nil, e.WithMessage(err, "DecodeJSON") + return nil, e.Wrap(err) } return tointerface(i), nil @@ -274,10 +273,11 @@ func (enc *Encoder) analyze(d encoder.DecodeDetail, v interface{}) encoder.Decod case json.Unmarshaler: d.Desc = "JSONUnmarshaler" d.Decode = func(b []byte, _ hint.Hint) (interface{}, error) { + e := util.StringError("UnmarshalJSON") i := reflect.New(elem.Type()).Interface() if err := i.(json.Unmarshaler).UnmarshalJSON(b); err != nil { //nolint:forcetypeassert //... - return nil, e.WithMessage(err, "UnmarshalJSON") + return nil, e.Wrap(err) } return tointerface(i), nil @@ -285,10 +285,11 @@ func (enc *Encoder) analyze(d encoder.DecodeDetail, v interface{}) encoder.Decod case encoding.TextUnmarshaler: d.Desc = "TextUnmarshaler" d.Decode = func(b []byte, _ hint.Hint) (interface{}, error) { + e := util.StringError("UnmarshalText") i := reflect.New(elem.Type()).Interface() if err := i.(encoding.TextUnmarshaler).UnmarshalText(b); err != nil { //nolint:forcetypeassert //... - return nil, e.WithMessage(err, "UnmarshalText") + return nil, e.Wrap(err) } return tointerface(i), nil @@ -296,10 +297,11 @@ func (enc *Encoder) analyze(d encoder.DecodeDetail, v interface{}) encoder.Decod default: d.Desc = "native" d.Decode = func(b []byte, _ hint.Hint) (interface{}, error) { + e := util.StringError("native UnmarshalJSON") i := reflect.New(elem.Type()).Interface() if err := util.UnmarshalJSON(b, i); err != nil { - return nil, e.WithMessage(err, "native UnmarshalJSON") + return nil, e.Wrap(err) } return tointerface(i), nil diff --git a/util/error.go b/util/error.go index 6a3f8d9e..7f67b783 100644 --- a/util/error.go +++ b/util/error.go @@ -64,7 +64,7 @@ func (er *baseError) WithMessage(err error, format string, args ...interface{}) extra := fmt.Sprintf(format, args...) if len(er.extra) > 0 { - extra = er.extra + "; " + extra + extra = er.extra + ": " + extra } return &baseError{ @@ -81,7 +81,7 @@ func (er *baseError) Errorf(format string, args ...interface{}) *baseError { extra := fmt.Sprintf(format, args...) if len(er.extra) > 0 { - extra = er.extra + "; " + extra + extra = er.extra + ": " + extra } return &baseError{ @@ -125,7 +125,7 @@ func (er *baseError) Error() string { if er.wrapped != nil { if e := er.wrapped.Error(); len(e) > 0 { - s += "; " + e + s += ": " + e } } @@ -153,7 +153,7 @@ func (er *baseError) Format(st fmt.State, verb rune) { } else { var d string if len(er.msg) > 0 { - d = "; " + d = ": " } _, _ = fmt.Fprintf(st, "%s\n%+v", d, er.wrapped) } diff --git a/util/isvalid.go b/util/isvalid.go index 62ebbd8c..d5a8d0f2 100644 --- a/util/isvalid.go +++ b/util/isvalid.go @@ -34,7 +34,7 @@ func checkIsValider(b []byte, allowNil bool, i int, v IsValider) error { // revi return nil } - return ErrInvalid.Errorf("%dth: nil found", i) + return ErrInvalid.Errorf("%dth nil found", i) } if err := v.IsValid(b); err != nil { From 4ac73fa8ba0bb8658147fff927ecc5d06dcbac7d Mon Sep 17 00:00:00 2001 From: soonkuk Date: Mon, 15 Apr 2024 17:35:36 +0900 Subject: [PATCH 7/7] feat: go.mod updated --- go.mod | 57 +++++++++++------------ go.sum | 145 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 98 insertions(+), 104 deletions(-) diff --git a/go.mod b/go.mod index 19fa772c..991b3d41 100644 --- a/go.mod +++ b/go.mod @@ -4,35 +4,35 @@ go 1.21 require ( github.com/Masterminds/semver/v3 v3.2.1 - github.com/alecthomas/kong v0.8.1 + github.com/alecthomas/kong v0.9.0 github.com/alicebob/miniredis/v2 v2.31.0 github.com/arl/statsviz v0.6.0 - github.com/beevik/ntp v1.3.0 + github.com/beevik/ntp v1.3.1 github.com/bluele/gcache v0.0.2 github.com/btcsuite/btcd/btcec/v2 v2.3.2 - github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 + github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce - github.com/bytedance/sonic v1.10.2 + github.com/bytedance/sonic v1.11.3 github.com/gofrs/uuid v4.4.0+incompatible - github.com/hashicorp/consul/api v1.26.1 - github.com/hashicorp/memberlist v0.5.1-0.20230206163934-e5eb6d78d6f2 - github.com/hashicorp/vault/api v1.10.0 + github.com/hashicorp/consul/api v1.28.2 + github.com/hashicorp/memberlist v0.5.1 + github.com/hashicorp/vault/api v1.12.2 github.com/json-iterator/go v1.1.12 github.com/mattn/go-isatty v0.0.20 github.com/oklog/ulid/v2 v2.1.0 github.com/pkg/errors v0.9.1 github.com/quic-go/quic-go v0.39.1 - github.com/redis/go-redis/v9 v9.3.0 - github.com/rs/zerolog v1.31.0 - github.com/stretchr/testify v1.8.4 + github.com/redis/go-redis/v9 v9.5.1 + github.com/rs/zerolog v1.32.0 + github.com/stretchr/testify v1.9.0 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/zeebo/blake3 v0.2.3 go.uber.org/goleak v1.3.0 - golang.org/x/crypto v0.17.0 - golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa - golang.org/x/mod v0.14.0 - golang.org/x/sync v0.5.0 - golang.org/x/time v0.4.0 + golang.org/x/crypto v0.21.0 + golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 + golang.org/x/mod v0.16.0 + golang.org/x/sync v0.6.0 + golang.org/x/time v0.5.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -44,19 +44,19 @@ require ( github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fatih/color v1.16.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-jose/go-jose/v3 v3.0.1 // indirect + github.com/go-jose/go-jose/v3 v3.0.3 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect - github.com/gorilla/websocket v1.5.0 // indirect + github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f // indirect + github.com/gorilla/websocket v1.5.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v1.5.0 // indirect + github.com/hashicorp/go-hclog v1.6.3 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -69,28 +69,27 @@ require ( github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/serf v0.10.1 // indirect - github.com/klauspost/cpuid/v2 v2.2.6 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/miekg/dns v1.1.56 // indirect + github.com/miekg/dns v1.1.58 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/onsi/ginkgo v1.16.5 // indirect - github.com/onsi/ginkgo/v2 v2.13.1 // indirect + github.com/onsi/ginkgo/v2 v2.17.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/quic-go/qtls-go1-20 v0.3.4 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect - github.com/stretchr/objx v0.5.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/yuin/gopher-lua v1.1.0 // indirect - go.uber.org/mock v0.3.0 // indirect - golang.org/x/arch v0.6.0 // indirect - golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.15.0 // indirect + go.uber.org/mock v0.4.0 // indirect + golang.org/x/arch v0.7.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.15.0 // indirect + golang.org/x/tools v0.19.0 // indirect google.golang.org/protobuf v1.29.1 // indirect ) diff --git a/go.sum b/go.sum index b5c4d5b2..4507bd8c 100644 --- a/go.sum +++ b/go.sum @@ -3,12 +3,12 @@ github.com/DmitriyVTitov/size v1.5.0/go.mod h1:le6rNI4CoLQV1b9gzp1+3d7hMAD/uu2Qc github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= -github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0= -github.com/alecthomas/assert/v2 v2.1.0/go.mod h1:b/+1DI2Q6NckYi+3mXyH3wFb8qG37K/DuK80n7WefXA= -github.com/alecthomas/kong v0.8.1 h1:acZdn3m4lLRobeh3Zi2S2EpnXTd1mOL6U7xVml+vfkY= -github.com/alecthomas/kong v0.8.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U= -github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE= -github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= +github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU= +github.com/alecthomas/assert/v2 v2.6.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/kong v0.9.0 h1:G5diXxc85KvoV2f0ZRVuMsi45IrBgx9zDNGNj165aPA= +github.com/alecthomas/kong v0.9.0/go.mod h1:Y47y5gKfHp1hDc7CH7OeXgLIpp+Q2m1Ni0L5s3bI8Os= +github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= +github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -25,8 +25,8 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beevik/ntp v1.3.0 h1:/w5VhpW5BGKS37vFm1p9oVk/t4HnnkKZAZIubHM6F7Q= -github.com/beevik/ntp v1.3.0/go.mod h1:vD6h1um4kzXpqmLTuu0cCLcC+NfvC0IC+ltmEDA8E78= +github.com/beevik/ntp v1.3.1 h1:Y/srlT8L1yQr58kyPWFPZIxRL8ttx2SRIpVYJqZIlAM= +github.com/beevik/ntp v1.3.1/go.mod h1:fT6PylBq86Tsq23ZMEe47b7QQrZfYBFPnpzt0a9kJxw= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -40,8 +40,8 @@ github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ= +github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= @@ -53,8 +53,8 @@ github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtE github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= -github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= -github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= +github.com/bytedance/sonic v1.11.3 h1:jRN+yEjakWh8aK5FzrciUHG8OFXK+4/KrAX/ysEtHAA= +github.com/bytedance/sonic v1.11.3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M= github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -80,8 +80,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -93,14 +93,14 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA= -github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= +github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= +github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -132,19 +132,19 @@ github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl76 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk= -github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/hashicorp/consul/api v1.26.1 h1:5oSXOO5fboPZeW5SN+TdGFP/BILDgBm19OrPZ/pICIM= -github.com/hashicorp/consul/api v1.26.1/go.mod h1:B4sQTeaSO16NtynqrAdwOlahJ7IUDZM9cj2420xYL8A= -github.com/hashicorp/consul/sdk v0.15.0 h1:2qK9nDrr4tiJKRoxPGhm6B7xJjLVIQqkjiab2M4aKjU= -github.com/hashicorp/consul/sdk v0.15.0/go.mod h1:r/OmRRPbHOe0yxNahLw7G9x5WG17E1BIECMtCjcPSNo= +github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f h1:f00RU+zOX+B3rLAmMMkzHUF2h1z4DeYR9tTCvEq2REY= +github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/hashicorp/consul/api v1.28.2 h1:mXfkRHrpHN4YY3RqL09nXU1eHKLNiuAN4kHvDQ16k/8= +github.com/hashicorp/consul/api v1.28.2/go.mod h1:KyzqzgMEya+IZPcD65YFoOVAgPpbfERu4I/tzG6/ueE= +github.com/hashicorp/consul/sdk v0.16.0 h1:SE9m0W6DEfgIVCJX7xU+iv/hUl4m/nxqMTnCdMxDpJ8= +github.com/hashicorp/consul/sdk v0.16.0/go.mod h1:7pxqqhqoaPqnBnzXD1StKed62LqJeClzVsUEy85Zr0A= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -152,8 +152,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -192,8 +192,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= -github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ= -github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8= +github.com/hashicorp/vault/api v1.12.2 h1:7YkCTE5Ni90TcmYHDBExdt4WGJxhpzaHqR6uGbQb/rE= +github.com/hashicorp/vault/api v1.12.2/go.mod h1:LSGf1NGT1BnvFFnKVtnvcaLBM2Lz+gJdpL6HUYed8KE= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -207,8 +207,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= -github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= -github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= +github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -237,8 +237,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE= -github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY= +github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= +github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -264,13 +264,13 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= -github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= +github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= +github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= +github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -299,13 +299,13 @@ github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNV github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= github.com/quic-go/quic-go v0.39.1 h1:d/m3oaN/SD2c+f7/yEjZxe2zEVotXprnrCCJ2y/ZZFE= github.com/quic-go/quic-go v0.39.1/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= -github.com/redis/go-redis/v9 v9.3.0 h1:RiVDjmig62jIWp7Kk4XVLs0hzV6pI3PyTnnL0cnn0u0= -github.com/redis/go-redis/v9 v9.3.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8= +github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= -github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= @@ -319,8 +319,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= -github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -331,9 +331,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= @@ -351,30 +350,29 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= -go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc= -golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= +golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw= +golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -389,9 +387,8 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -401,8 +398,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -441,16 +438,15 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -458,19 +454,18 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= -golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=