diff options
| author | Emil <mursalimovemeel@gmail.com> | 2018-09-15 04:07:13 +0800 | 
|---|---|---|
| committer | Felix Lange <fjl@users.noreply.github.com> | 2018-09-15 04:07:13 +0800 | 
| commit | 86a03f97d30c11a5321fa2f0fd37cbc4c7f63a32 (patch) | |
| tree | 92ee61a4d5a2c750b6abc257f30b040485e29842 | |
| parent | 7bb95a9a64c9d26bef4f15fdd9301bb0b5cdb668 (diff) | |
| download | dexon-86a03f97d30c11a5321fa2f0fd37cbc4c7f63a32.tar.gz dexon-86a03f97d30c11a5321fa2f0fd37cbc4c7f63a32.tar.zst dexon-86a03f97d30c11a5321fa2f0fd37cbc4c7f63a32.zip | |
all: simplify s[:] to s where s is a slice (#17673)
| -rw-r--r-- | cmd/evm/disasm.go | 2 | ||||
| -rw-r--r-- | common/bytes.go | 2 | ||||
| -rw-r--r-- | core/chain_indexer.go | 2 | ||||
| -rw-r--r-- | core/types/bloom9.go | 4 | ||||
| -rw-r--r-- | eth/tracers/tracer.go | 8 | ||||
| -rw-r--r-- | p2p/discover/table.go | 2 | ||||
| -rw-r--r-- | p2p/discv5/table.go | 2 | ||||
| -rw-r--r-- | swarm/api/http/server_test.go | 14 | ||||
| -rw-r--r-- | swarm/pss/pss.go | 2 | ||||
| -rw-r--r-- | swarm/storage/ldbstore.go | 10 | ||||
| -rw-r--r-- | swarm/storage/ldbstore_test.go | 2 | ||||
| -rw-r--r-- | swarm/storage/types.go | 2 | ||||
| -rw-r--r-- | whisper/whisperv5/filter_test.go | 2 | ||||
| -rw-r--r-- | whisper/whisperv6/filter_test.go | 2 | 
14 files changed, 28 insertions, 28 deletions
| diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 4a442cf78..69f611e39 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -44,7 +44,7 @@ func disasmCmd(ctx *cli.Context) error {  		return err  	} -	code := strings.TrimSpace(string(in[:])) +	code := strings.TrimSpace(string(in))  	fmt.Printf("%v\n", code)  	return asm.PrintDisassembled(code)  } diff --git a/common/bytes.go b/common/bytes.go index cbab2c3fa..0c257a1ee 100644 --- a/common/bytes.go +++ b/common/bytes.go @@ -100,7 +100,7 @@ func Hex2BytesFixed(str string, flen int) []byte {  		return h[len(h)-flen:]  	}  	hh := make([]byte, flen) -	copy(hh[flen-len(h):flen], h[:]) +	copy(hh[flen-len(h):flen], h)  	return hh  } diff --git a/core/chain_indexer.go b/core/chain_indexer.go index 89ee75eb2..4bdd4ba1c 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -445,7 +445,7 @@ func (c *ChainIndexer) AddChildIndexer(indexer *ChainIndexer) {  func (c *ChainIndexer) loadValidSections() {  	data, _ := c.indexDb.Get([]byte("count"))  	if len(data) == 8 { -		c.storedSections = binary.BigEndian.Uint64(data[:]) +		c.storedSections = binary.BigEndian.Uint64(data)  	}  } diff --git a/core/types/bloom9.go b/core/types/bloom9.go index a76b6f33c..d045c9e66 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -113,7 +113,7 @@ func LogsBloom(logs []*Log) *big.Int {  }  func bloom9(b []byte) *big.Int { -	b = crypto.Keccak256(b[:]) +	b = crypto.Keccak256(b)  	r := new(big.Int) @@ -130,7 +130,7 @@ var Bloom9 = bloom9  func BloomLookup(bin Bloom, topic bytesBacked) bool {  	bloom := bin.Big() -	cmp := bloom9(topic.Bytes()[:]) +	cmp := bloom9(topic.Bytes())  	return bloom.And(bloom, cmp).Cmp(cmp) == 0  } diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index feb57e060..b519236f2 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -124,7 +124,7 @@ func (mw *memoryWrapper) pushObject(vm *duktape.Context) {  		ctx.Pop2()  		ptr := ctx.PushFixedBuffer(len(blob)) -		copy(makeSlice(ptr, uint(len(blob))), blob[:]) +		copy(makeSlice(ptr, uint(len(blob))), blob)  		return 1  	})  	vm.PutPropString(obj, "slice") @@ -204,7 +204,7 @@ func (dw *dbWrapper) pushObject(vm *duktape.Context) {  		code := dw.db.GetCode(common.BytesToAddress(popSlice(ctx)))  		ptr := ctx.PushFixedBuffer(len(code)) -		copy(makeSlice(ptr, uint(len(code))), code[:]) +		copy(makeSlice(ptr, uint(len(code))), code)  		return 1  	})  	vm.PutPropString(obj, "getCode") @@ -268,7 +268,7 @@ func (cw *contractWrapper) pushObject(vm *duktape.Context) {  		blob := cw.contract.Input  		ptr := ctx.PushFixedBuffer(len(blob)) -		copy(makeSlice(ptr, uint(len(blob))), blob[:]) +		copy(makeSlice(ptr, uint(len(blob))), blob)  		return 1  	})  	vm.PutPropString(obj, "getInput") @@ -584,7 +584,7 @@ func (jst *Tracer) GetResult() (json.RawMessage, error) {  		case []byte:  			ptr := jst.vm.PushFixedBuffer(len(val)) -			copy(makeSlice(ptr, uint(len(val))), val[:]) +			copy(makeSlice(ptr, uint(len(val))), val)  		case common.Address:  			ptr := jst.vm.PushFixedBuffer(20) diff --git a/p2p/discover/table.go b/p2p/discover/table.go index 0a554bbeb..a130b5494 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -162,7 +162,7 @@ func (tab *Table) ReadRandomNodes(buf []*Node) (n int) {  	var buckets [][]*Node  	for _, b := range &tab.buckets {  		if len(b.entries) > 0 { -			buckets = append(buckets, b.entries[:]) +			buckets = append(buckets, b.entries)  		}  	}  	if len(buckets) == 0 { diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index c793be508..4f4b2426f 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -123,7 +123,7 @@ func (tab *Table) readRandomNodes(buf []*Node) (n int) {  	var buckets [][]*Node  	for _, b := range &tab.buckets {  		if len(b.entries) > 0 { -			buckets = append(buckets, b.entries[:]) +			buckets = append(buckets, b.entries)  		}  	}  	if len(buckets) == 0 { diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index 2acdbd1ad..4a3ca0429 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -501,7 +501,7 @@ func testBzzGetPath(encrypted bool, t *testing.T) {  		var respbody []byte  		url := srv.URL + "/bzz-raw:/" -		if k[:] != "" { +		if k != "" {  			url += rootRef + "/" + k[1:] + "?content_type=text/plain"  		}  		resp, err = http.Get(url) @@ -515,7 +515,7 @@ func testBzzGetPath(encrypted bool, t *testing.T) {  			isexpectedfailrequest := false  			for _, r := range expectedfailrequests { -				if k[:] == r { +				if k == r {  					isexpectedfailrequest = true  				}  			} @@ -530,7 +530,7 @@ func testBzzGetPath(encrypted bool, t *testing.T) {  		var respbody []byte  		url := srv.URL + "/bzz-hash:/" -		if k[:] != "" { +		if k != "" {  			url += rootRef + "/" + k[1:]  		}  		resp, err = http.Get(url) @@ -547,7 +547,7 @@ func testBzzGetPath(encrypted bool, t *testing.T) {  			isexpectedfailrequest := false  			for _, r := range expectedfailrequests { -				if k[:] == r { +				if k == r {  					isexpectedfailrequest = true  				}  			} @@ -599,7 +599,7 @@ func testBzzGetPath(encrypted bool, t *testing.T) {  	} {  		k := c.path  		url := srv.URL + "/bzz-list:/" -		if k[:] != "" { +		if k != "" {  			url += rootRef + "/" + k[1:]  		}  		t.Run("json list "+c.path, func(t *testing.T) { @@ -618,7 +618,7 @@ func testBzzGetPath(encrypted bool, t *testing.T) {  				isexpectedfailrequest := false  				for _, r := range expectedfailrequests { -					if k[:] == r { +					if k == r {  						isexpectedfailrequest = true  					}  				} @@ -650,7 +650,7 @@ func testBzzGetPath(encrypted bool, t *testing.T) {  					isexpectedfailrequest := false  					for _, r := range expectedfailrequests { -						if k[:] == r { +						if k == r {  							isexpectedfailrequest = true  						}  					} diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index b55c97fdd..b96649fea 100644 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -448,7 +448,7 @@ func (p *Pss) isSelfRecipient(msg *PssMsg) bool {  // test match of leftmost bytes in given message to node's Kademlia address  func (p *Pss) isSelfPossibleRecipient(msg *PssMsg) bool {  	local := p.Kademlia.BaseAddr() -	return bytes.Equal(msg.To[:], local[:len(msg.To)]) +	return bytes.Equal(msg.To, local[:len(msg.To)])  }  ///////////////////////////////////////////////////////////////////// diff --git a/swarm/storage/ldbstore.go b/swarm/storage/ldbstore.go index 8ab7e60b3..bde627394 100644 --- a/swarm/storage/ldbstore.go +++ b/swarm/storage/ldbstore.go @@ -85,7 +85,7 @@ func NewLDBStoreParams(storeparams *StoreParams, path string) *LDBStoreParams {  	return &LDBStoreParams{  		StoreParams: storeparams,  		Path:        path, -		Po:          func(k Address) (ret uint8) { return uint8(Proximity(storeparams.BaseKey[:], k[:])) }, +		Po:          func(k Address) (ret uint8) { return uint8(Proximity(storeparams.BaseKey, k[:])) },  	}  } @@ -322,7 +322,7 @@ func (s *LDBStore) Export(out io.Writer) (int64, error) {  		log.Trace("store.export", "dkey", fmt.Sprintf("%x", datakey), "dataidx", index.Idx, "po", po)  		data, err := s.db.Get(datakey)  		if err != nil { -			log.Warn(fmt.Sprintf("Chunk %x found but could not be accessed: %v", key[:], err)) +			log.Warn(fmt.Sprintf("Chunk %x found but could not be accessed: %v", key, err))  			continue  		} @@ -455,7 +455,7 @@ func (s *LDBStore) Cleanup() {  			}  			if !found { -				log.Warn(fmt.Sprintf("Chunk %x found but count not be accessed with any po", key[:])) +				log.Warn(fmt.Sprintf("Chunk %x found but count not be accessed with any po", key))  				errorsFound++  				continue  			} @@ -469,10 +469,10 @@ func (s *LDBStore) Cleanup() {  		}  		cs := int64(binary.LittleEndian.Uint64(c.sdata[:8])) -		log.Trace("chunk", "key", fmt.Sprintf("%x", key[:]), "ck", fmt.Sprintf("%x", ck), "dkey", fmt.Sprintf("%x", datakey), "dataidx", index.Idx, "po", po, "len data", len(data), "len sdata", len(c.sdata), "size", cs) +		log.Trace("chunk", "key", fmt.Sprintf("%x", key), "ck", fmt.Sprintf("%x", ck), "dkey", fmt.Sprintf("%x", datakey), "dataidx", index.Idx, "po", po, "len data", len(data), "len sdata", len(c.sdata), "size", cs)  		if len(c.sdata) > ch.DefaultSize+8 { -			log.Warn("chunk for cleanup", "key", fmt.Sprintf("%x", key[:]), "ck", fmt.Sprintf("%x", ck), "dkey", fmt.Sprintf("%x", datakey), "dataidx", index.Idx, "po", po, "len data", len(data), "len sdata", len(c.sdata), "size", cs) +			log.Warn("chunk for cleanup", "key", fmt.Sprintf("%x", key), "ck", fmt.Sprintf("%x", ck), "dkey", fmt.Sprintf("%x", datakey), "dataidx", index.Idx, "po", po, "len data", len(data), "len sdata", len(c.sdata), "size", cs)  			s.delete(index.Idx, getIndexKey(key[1:]), po)  			removed++  			errorsFound++ diff --git a/swarm/storage/ldbstore_test.go b/swarm/storage/ldbstore_test.go index ae70ee259..75b5d6aa9 100644 --- a/swarm/storage/ldbstore_test.go +++ b/swarm/storage/ldbstore_test.go @@ -74,7 +74,7 @@ func newTestDbStore(mock bool, trusted bool) (*testDbStore, func(), error) {  func testPoFunc(k Address) (ret uint8) {  	basekey := make([]byte, 32) -	return uint8(Proximity(basekey[:], k[:])) +	return uint8(Proximity(basekey, k[:]))  }  func (db *testDbStore) close() { diff --git a/swarm/storage/types.go b/swarm/storage/types.go index bc2af2cd7..8c70f4584 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -136,7 +136,7 @@ func (a Address) Log() string {  }  func (a Address) String() string { -	return fmt.Sprintf("%064x", []byte(a)[:]) +	return fmt.Sprintf("%064x", []byte(a))  }  func (a Address) MarshalJSON() (out []byte, err error) { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index c01c22668..33138fb1a 100644 --- a/whisper/whisperv5/filter_test.go +++ b/whisper/whisperv5/filter_test.go @@ -56,7 +56,7 @@ func generateFilter(t *testing.T, symmetric bool) (*Filter, error) {  	f.Topics = make([][]byte, topicNum)  	for i := 0; i < topicNum; i++ {  		f.Topics[i] = make([]byte, 4) -		mrand.Read(f.Topics[i][:]) +		mrand.Read(f.Topics[i])  		f.Topics[i][0] = 0x01  	} diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index 82e4aa024..5ce99d9f6 100644 --- a/whisper/whisperv6/filter_test.go +++ b/whisper/whisperv6/filter_test.go @@ -56,7 +56,7 @@ func generateFilter(t *testing.T, symmetric bool) (*Filter, error) {  	f.Topics = make([][]byte, topicNum)  	for i := 0; i < topicNum; i++ {  		f.Topics[i] = make([]byte, 4) -		mrand.Read(f.Topics[i][:]) +		mrand.Read(f.Topics[i])  		f.Topics[i][0] = 0x01  	} | 
